From 5c8bdefab823bb7efa21d97e553d1c426e9fdc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 28 Jun 2019 00:25:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/edu_user/EWM.jpg | Bin 0 -> 27828 bytes public/react/src/common/UrlTool.js | 2 +- .../react/src/context/TPIContextProvider.js | 2 +- .../modules/courses/Resource/Fileslistitem.js | 30 +- .../courses/coursesDetail/CoursesBanner.js | 11 +- .../courses/coursesDetail/CoursesLeftNav.js | 3 +- .../courses/coursesPublic/Associationmodel.js | 4 +- .../courses/coursesPublic/SelectSetting.js | 4 +- .../graduation/tasks/GraduateTaskItem.js | 23 +- .../tasks/GraduationTaskssettinglist.js | 6 +- .../modules/courses/graduation/tasks/index.js | 2 +- .../courses/shixunHomework/Listofworks.js | 2 +- .../shixunHomework/ShixunWorkReport.js | 23 +- .../shixunHomework/ShixunhomeWorkItem.js | 15 +- .../shixunHomework/Trainingjobsetting.js | 2 +- .../shixunHomework/Workquestionandanswer.js | 2 +- .../courses/shixunHomework/shixunHomework.js | 8 +- .../shixunreport/ConclusionEvaluation.js | 210 +- .../shixunreport/Coursesshixundetails.js | 145 +- .../shixunreport/Shixunechart.js | 2 +- public/react/src/modules/tpm/NewHeader.js | 2 +- .../tpm/challengesnew/TPMevaluation.js | 2227 +++++++++-------- 22 files changed, 1389 insertions(+), 1336 deletions(-) create mode 100644 public/images/edu_user/EWM.jpg diff --git a/public/images/edu_user/EWM.jpg b/public/images/edu_user/EWM.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3b79aca8b65fe8dad40ca417ef510ea44df3a9b7 GIT binary patch literal 27828 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 BvXB4( literal 0 HcmV?d00001 diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js index 6a6bb348d..71eb8e32a 100644 --- a/public/react/src/common/UrlTool.js +++ b/public/react/src/common/UrlTool.js @@ -3,7 +3,7 @@ export function getImageUrl(path) { // https://www.educoder.net // https://testbdweb.trustie.net // const local = 'http://localhost:3000' - const local = 'https://testeduplus2.educoder.net' + const local = 'http://47.96.87.25:48080' if (isDev) { return `${local}/${path}` } diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js index b332c50a8..b5c8cf565 100644 --- a/public/react/src/context/TPIContextProvider.js +++ b/public/react/src/context/TPIContextProvider.js @@ -171,7 +171,7 @@ class TPIContextProvider extends Component { } let testPath = '' if (window.location.port == 3007) { - testPath = 'https://testeduplus2.educoder.net' + testPath = 'http://47.96.87.25:48080' } // var url = `${testPath}/api/v1/games/${ game.identifier }/cost_time` var url = `${testPath}/api/tasks/${ game.identifier }/cost_time` diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index 1165eae5a..a20dcf9c3 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -169,7 +169,8 @@ class Fileslistitem extends Component{ margin-top: 0px; } `} - {checkBox} + +
- + + {checkBox} + { this.props.isAdmin ? {discussMessage.course_groups.length===0?"": -

+

{discussMessage.course_groups.map((item,key)=>{ return(

@@ -275,7 +278,7 @@ class Fileslistitem extends Component{

} -

+

{discussMessage.author.login} 大小 {discussMessage.filesize} @@ -290,7 +293,7 @@ class Fileslistitem extends Component{ {this.props.isAdmin ||this.props.current_user.login===discussMessage.author.login? - + - - {/**/} - - 

资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}
- - {/*{this.props.isAdmin ?this.settingList()}>:""}*/} - +

+ 

资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}
+ {/**/} + {/*/!**!/*/} + {/**/} + + {/**/} + {/*/!*{this.props.isAdmin ?this.settingList()}>:""}*!/*/} + {/**/}

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index f4f097a33..3389951f5 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -454,10 +454,19 @@ class CoursesBanner extends Component {
+
} diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js index 2b4b935ba..61cbecf11 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js +++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js @@ -475,7 +475,7 @@ class Selectsetting extends Component{ `}
  • - {datalist&&datalist.title} + {datalist&&datalist.title} {datalist&&datalist.attachment_histories.length===0?"":当前版本}
  • - {item.title} + {item.title} {/*当前版本*/}
  • {` + .boardsList .contentSection { + margin-left: 0px !important; + } + `}}
    { data&&data.shixun_detail===undefined?"":data.shixun_detail.map((item,key)=>{ + // console.log(item) return(
    @@ -185,7 +195,7 @@ class ShixunWorkReport extends Component { />
    - {item.st===0?
    + {item.st===0?item.passed_code===null?"":

    最近通过的代码 @@ -223,6 +233,7 @@ class ShixunWorkReport extends Component {

    + ) } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index b63e210ef..aaf02498b 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -346,8 +346,19 @@ class ShixunhomeWorkItem extends Component{

    - - {this.props.isAdmin?
    + + {this.props.isAdmin?
    实训详情 {this.props.isClassManagement?this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名:""} 设置 diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 12d21fb53..5d9d2d200 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1708,7 +1708,7 @@ class Trainingjobsetting extends Component { 立即发布 : "": ""} {this.props.isAdmin()? - this.state.code_review===true?代码查重 + this.state.code_review===false?代码查重 : "":""}
    diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index 35b9d7de7..fe6d68c77 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -421,7 +421,7 @@ class Workquestionandanswer extends Component { {this.props.isAdmin()? - this.state.code_review===true? + this.state.code_review===false? 代码查重 :"":""} diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index c3be53486..e9c6103e1 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -753,7 +753,7 @@ class ShixunHomework extends Component{ }) this.props.showNotification(response.data.message) this.homeworkupdatalist(Coursename,page,order); - + this.props.updataleftNavfun() } }) .catch(function (error) { @@ -782,7 +782,7 @@ class ShixunHomework extends Component{ this.setState({ Modalstype:true, - Modalstopval:"已提交作品将全部被删除，不可恢复，", + Modalstopval:"已提交作品将全部被删除，不可恢复", ModalsBottomval:"是否确认删除？", ModalCancel:this.cancelmodel, ModalSave:this.savedelete, @@ -1074,7 +1074,7 @@ class ShixunHomework extends Component{ {/*this.editname(datas&&datas.main_category_name)} className={"mr30"}>目录重命名*/} : this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名:""} - {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?选用实训课程:"":""} + {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?选用实训课程:"":""} {this.props.isAdmin()===true?this.createCommonWork()}>选用实训:""}

    • @@ -1085,7 +1085,7 @@ class ShixunHomework extends Component{
    共 {datas&&datas.all_count}个实训作业 已发布：{datas&&datas.published_count}个 - {this.props.isAdmin()?未发布： {datas&&datas.unpublished_count}个:""} + 未发布： {datas&&datas.unpublished_count}个

    diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js index ec9bf974b..5e922d7eb 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js @@ -1,103 +1,109 @@ -import React, {Component} from "react"; -import {WordsBtn} from 'educoder'; -import {Table} from "antd"; -import {Link,Switch,Route,Redirect} from 'react-router-dom'; - -class ConclusionEvaluation extends Component { - - constructor(props) { - super(props); - this.state = { - } - } - - componentDidMount() { - - } - - render() { - let {data}=this.props; - let columns=[{ - title: '总评', - dataIndex: 'type', - key: 'type', - render: (text, record) => ( - {record.type} - ), - }, { - title: '获得经验值', - dataIndex: 'empirical', - key: 'empirical', - render: (text, record) => ( - - {record.empirical.minute}/{record.empirical.total} - - ), - }, { - title: '作业成绩', - dataIndex: 'grade', - key: 'grade', - render: (text, record) => ( - - {record.grade.minute}/{record.grade.minute} - - ), - }, { - title: '耗时', - key: 'elapsed', - dataIndex: 'elapsed', - - render: (text, record) => ( - - {record.elapsed} - - ), - }, { - title: '评测次数', - key: 'time', - dataIndex: 'time', - render: (text, record) => ( - - {record.time} - - ), - }]; - - let datas=[]; - - datas.push({ - type: data&&data.overall_appraisal, - empirical: {minute:data&&data.myself_experience,total:data&&data.total_experience}, - grade: {minute:data&&data.work_score,total:data&&data.all_work_score}, - elapsed: data&&data.time_consuming, - time:data&&data.evaluate_count - }) - return ( -
    - {/*{data===undefined?"":""}*/} - - - - - ) - } -} - +import React, {Component} from "react"; +import {WordsBtn} from 'educoder'; +import {Table,Tooltip,} from "antd"; +import {Link,Switch,Route,Redirect} from 'react-router-dom'; + +class ConclusionEvaluation extends Component { + + constructor(props) { + super(props); + this.state = { + } + } + + componentDidMount() { + + } + + render() { + let {data}=this.props; + let columns=[{ + title: '总评', + dataIndex: 'type', + key: 'type', + render: (text, record) => ( + {record.type} + ), + }, { + title: '获得经验值', + dataIndex: 'empirical', + key: 'empirical', + render: (text, record) => ( + + {record.empirical.minute}/{record.empirical.total} + + ), + }, { + title: '作业成绩', + dataIndex: 'grade', + key: 'grade', + render: (text, record) => ( + + + 分数：{record.grade.minute}/总分：{record.grade.total} + + }> + {record.grade.minute}/{record.grade.total} + + + ), + }, { + title: '耗时', + key: 'elapsed', + dataIndex: 'elapsed', + + render: (text, record) => ( + + {record.elapsed} + + ), + }, { + title: '评测次数', + key: 'time', + dataIndex: 'time', + render: (text, record) => ( + + {record.time} + + ), + }]; + + let datas=[]; + + datas.push({ + type: data&&data.overall_appraisal, + empirical: {minute:data&&data.myself_experience,total:data&&data.total_experience}, + grade: {minute:data&&data.work_score,total:data&&data.all_work_score}, + elapsed: data&&data.time_consuming, + time:data&&data.evaluate_count + }) + return ( +
    + {/*{data===undefined?"":""}*/} + +
    + + + ) + } +} + export default ConclusionEvaluation; \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js index 56b3ff9a2..529a4646b 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Coursesshixundetails.js @@ -1,73 +1,74 @@ -import React, {Component} from "react"; -import {WordsBtn} from 'educoder'; -import {Table} from "antd"; -import {Link,Switch,Route,Redirect} from 'react-router-dom'; - -class Coursesshixundetails extends Component { - - constructor(props) { - super(props); - this.state = { - loadingstate:true - } - } - - componentDidMount() { - - } - - render() { - let {data}=this.props; - let columns=[{ - title: '评测次数', - dataIndex: 'number', - width:"127px", - key: 'number', - render: (text, record) => ( - - {record.number} - - ), - }, { - title: '详细信息', - dataIndex: 'name', - key: 'name', - render: (text, record) => ( - - {record.name} - - ), - }]; - - let datas=[]; - data&&data.forEach((item,key)=>{ - datas.push({ - number: item.position, - name: item.output_detail - - }) - }) - - return ( -
    - - {data&&data?
    :""} - - - ) - } -} - +import React, {Component} from "react"; +import {WordsBtn} from 'educoder'; +import {Table} from "antd"; +import {Link,Switch,Route,Redirect} from 'react-router-dom'; + +class Coursesshixundetails extends Component { + + constructor(props) { + super(props); + this.state = { + loadingstate:true + } + } + + componentDidMount() { + + } + + render() { + let {data}=this.props; + // console.log(data) + let columns=[{ + title: '评测次数', + dataIndex: 'number', + width:"127px", + key: 'number', + render: (text, record) => ( + + {record.number} + + ), + }, { + title: '详细信息', + dataIndex: 'name', + key: 'name', + render: (text, record) => ( + + {record.name} + + ), + }]; + + let datas=[]; + data&&data.forEach((item,key)=>{ + datas.push({ + number: item.position, + name: item.output_detail + + }) + }) + + return ( +
    + + {data&&data? data.length===0?"":
    :""} + + + ) + } +} + export default Coursesshixundetails; \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js index 99b9d5748..dcb10a301 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js @@ -61,7 +61,7 @@ function startechart(data){ yAxis: [ { type : "value", - name : " 实训总得分/实训总耗时", + name : " 实训总得分/实训总耗时", nameGap: 20, nameTextStyle: { color: '#000', diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index f43991599..4af1aa6ef 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -787,7 +787,7 @@ submittojoinclass=(value)=>{
  • 新建课堂
  • 新建实训
  • 新建实训课程
    • -
  • 新建项目
    • +
  • 新建项目
      • diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js index 1c55700ae..73262de74 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js +++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js @@ -1,1112 +1,1115 @@ -import React, {Component} from 'react'; - -import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Button,Icon,Tooltip} from 'antd'; - -import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom"; - -// import "antd/dist/antd.css"; - -import axios from 'axios'; - -import { getImageUrl, toPath } from 'educoder'; - -import './css/TPMchallengesnew.css'; - -import {getUrl} from 'educoder'; - -let origin = getUrl(); - -let path = getUrl("/editormd/lib/") - -const $ = window.$; - -let timeout; - -let currentValue; - -const Option = Select.Option; - -const RadioGroup = Radio.Group; - -function create_editorMD(id, width, high, placeholder, imageUrl, callback) { - var editorName = window.editormd(id, { - width: width, - height: high, - path: path, // "/editormd/lib/" - - syncScrolling: "single", - tex: true, - tocm: true, - emoji: true, - taskList: true, - codeFold: true, - searchReplace: true, - htmlDecode: "style,script,iframe", - sequenceDiagram: true, - autoFocus: false, - toolbarIcons: function () { - // Or return editormd.toolbarModes[name]; // full, simple, mini - // Using "||" set icons align right. - return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"] - }, - toolbarCustomIcons: { - testIcon: "
      ", - testIcon1: "
      " - }, - //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。 - saveHTMLToTextarea: true, - // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标 - dialogMaskOpacity: 0.6, - placeholder: placeholder, - imageUpload: true, - imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], - imageUploadURL: imageUrl,//url - onload: function () { - // this.previewing(); - $("#" + id + " [type=\"latex\"]").bind("click", function () { - editorName.cm.replaceSelection("```latex"); - editorName.cm.replaceSelection("\n"); - editorName.cm.replaceSelection("\n"); - editorName.cm.replaceSelection("```"); - var __Cursor = editorName.cm.getDoc().getCursor(); - editorName.cm.setCursor(__Cursor.line - 1, 0); - }); - - $("#" + id + " [type=\"inline\"]").bind("click", function () { - editorName.cm.replaceSelection("$$$$"); - var __Cursor = editorName.cm.getDoc().getCursor(); - editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2); - editorName.cm.focus(); - }); - $("[type=\"inline\"]").attr("title", "行内公式"); - $("[type=\"latex\"]").attr("title", "多行公式"); - - window.md_elocalStorage(editorName, `exercise__${id}`, "Memochallengesnew"); - - callback && callback() - } - }); - return editorName; -} - - -export default class TPMevaluation extends Component { - constructor(props) { - super(props) - this.state = { - choice_url: undefined, - practice_url: undefined, - go_back_url: undefined, - task_pass_default: undefined, - submit_url: undefined, - value: 1, - evaluationlist:[], - shixunId:undefined, - power:false, - shixunfilepath:undefined, - evaluationvisible:false, - trees:undefined, - path:"", - main:[], - saveshixunfilepath:undefined, - selectpath:undefined, - shixunfilepathplay:undefined, - shixunfileexpectpicturepath:undefined, - shixunfilestandardpicturepath:undefined, - shixunfilepicturepath:undefined, - pathoptionvalue:-1, - showrepositoryurltiptype: false, - prev_challenge: undefined, - next_challenge: undefined, - StudentTaskPapers:false, - StudentTaskDocs:false, - selectpatharr:[], - handpathopt:false, - scorevalue:false, - markvalue:true, - scoretype:undefined - } - } - - - exerciseMD(initValue, id) { - - this.contentChanged = false; - const placeholder = ""; -// amp; -// 编辑时要传memoId - const imageUrl = `/api/attachments.json`; -// 创建editorMd - - const exercise_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => { - setTimeout(() => { - exercise_editormd.resize() - exercise_editormd.cm && exercise_editormd.cm.refresh() - }, 500) - - if (initValue != undefined) { - exercise_editormd.setValue(initValue) - } - exercise_editormd.cm.on("change", (_cm, changeObj) => { - console.log('....contentChanged') - this.contentChanged = true; - }) - }); - this.exercise_editormd = exercise_editormd; - window.exercise_editormd = exercise_editormd; - - } - - componentDidMount() { - let id = this.props.match.params.shixunId; - let checkpointId=this.props.match.params.checkpointId; - this.setState({ - shixunId:id, - checkpointId:checkpointId - }) - let newchoice_url= "/shixuns/"+id+"/challenges/newquestion"; - let newpractice_url= "/shixuns/"+id+"/challenges/new"; - let newgo_back_url="/shixuns/"+id+"/challenges"; - - let url = "/shixuns/" + id + "/challenges/" + checkpointId + "/edit.json?tab=1"; - axios.get(url).then((response) => { - let newprev_challenge = response.data.prev_challenge; - let next_challenge = response.data.next_challenge; - if (newprev_challenge != undefined) { - if(newprev_challenge.st===0){ - newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint"; - }else{ - newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editquestion"; - } - } - if (next_challenge != undefined) { - - if(next_challenge.st===0){ - next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint"; - }else{ - next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion"; - } - } - let newevaluationlist=[] - if(response.data.test_sets.length===0){ - let newlist=[ - {hidden:0,input:"",output:"",score:50}, - {hidden:1,input:"",output:"",score:50} - ] - newevaluationlist=newlist - }else{ - newevaluationlist=response.data.test_sets - } - - this.setState({ - power: response.data.power, - evaluationlist:newevaluationlist, - shixunfilepath:response.data.path, - shixunfilepathplay:response.data.exec_path, - pathoptionvalue:response.data.show_type, - shixunfileexpectpicturepath:response.data.original_picture_path, - shixunfilestandardpicturepath:response.data.expect_picture_path, - shixunfilepicturepath:response.data.picture_path, - prev_challenge: newprev_challenge, - next_challenge: next_challenge, - choice_url: newchoice_url, // 导航中的新建选择题url - practice_url: newpractice_url, //string 导航中新建实践题url - go_back_url: newgo_back_url, //string 导航中的返回url - position: response.data.position, //int 关卡位置，导航栏中的第几关 - scorevalue:response.data.test_set_score, - markvalue:response.data.test_set_average, - }) - this.evaluationoninputvalueonload(); - if(response.data.power===false){ - this.props.showSnackbar("你没有权限修改"); - } - if(response.data.answer===undefined){ - this.answerMD("", "answerMD"); - }else{ - this.answerMD(response.data.answer, "answerMD"); - } - - }).catch((error) => { - console.log(error) - }); - - } - - - setevaluationlist=(newevaluationlist)=>{ - this.setState({ - evaluationlist:newevaluationlist - }) - } - - - addevaluationon=()=>{ - let {evaluationlist,markvalue}=this.state; - let newevaluationlist=evaluationlist; - newevaluationlist.push({hidden:0,input:"",output:"",score:0}); - newevaluationlist=this.oneditevaluationlist(newevaluationlist,markvalue); - this.setevaluationlist(newevaluationlist); - } - - del_test_array=(key)=>{ - let {evaluationlist,markvalue}=this.state; - let newevaluationlist=evaluationlist; - newevaluationlist.splice(key,1); - newevaluationlist=this.oneditevaluationlist(newevaluationlist,markvalue); - this.setevaluationlist(newevaluationlist); - } - - getfilepath=(e,shixunfilepath)=>{ - this.setState({ - evaluationvisible: true, - selectpath:e.target.value, - selectpatharr:[], - }); - let id = this.props.match.params.shixunId; - let url ="/shixuns/"+id+"/repository.json"; - axios.post(url,{ - path: "" - }).then((response) => { - if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { - - }else{ - this.setState({ - trees:response.data.trees, - saveshixunfilepath:shixunfilepath, - path:"", - main:[], - }) - } - - }).catch((error) => { - console.log(error) - }); - } - - sendgetfilepath=(newpath,type)=>{ - let id = this.props.match.params.shixunId; - let{path,main}=this.state; - let ary=main; - let paths=path; - - this.setState({ - selectpatharr:[], - }) - if(paths===""&&type==="tree"){ - newpath=newpath+"/"; - paths=""; - if(main.length===0){ - ary.push({val:"根目录/",path:""},{val:newpath,path:paths+newpath}) - }else{ - ary.push({val:newpath,path:paths+newpath}) - } - - }else if(paths!=""&&type==="tree"){ - newpath=newpath+"/"; - ary.push({val:newpath,path:paths+newpath}) - } - - - let url ="/shixuns/"+id+"/repository.json"; - if(type==="tree"){ - - axios.post(url,{ - path: paths+newpath - }).then((response) => { - if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { - - }else{ - this.setState({ - trees:response.data.trees, - path:paths+newpath, - main:ary, - // selectpath:"" - }) - } - - }).catch((error) => { - console.log(error) - }); - } - - } - - goblakepath=(path,key)=>{ - let {main,selectpath} =this.state; - let newmain=[] - for(var i=0;i<=key;i++){ - newmain.push(main[i]) - } - let id = this.props.match.params.shixunId; - let url ="/shixuns/"+id+"/repository.json"; - axios.post(url,{ - path: path - }).then((response) => { - if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { - - }else { - this.setState({ - trees: response.data.trees, - path: path, - main: newmain, - // selectpath:selectpath - }) - } - }).catch((error) => { - console.log(error) - }); - } - // delesavegetfilepath=(value)=>{ - // let {selectpatharr} = this.state - // let newarr =selectpatharr; - // let newselectpath=""; - // for(var i=0; i{ - let {selectpath} = this.state - // let newarr =selectpatharr; - // let arrtype=false; - // let arrsum=0; - // let newselectpath=""; - // newarr.push(value) - // if(newarr.length>1&&arrtype===false){ - // for(var i=0; i{ - let {saveshixunfilepath,selectpath}=this.state; - this.setState({ - evaluationvisible: false, - [saveshixunfilepath]:selectpath - }); - } - evaluationhideModal=()=>{ - this.setState({ - evaluationvisible: false, - }); - } - handpathoptionvalue=(value)=>{ - this.setState({ - pathoptionvalue:value - }) - } - showrepositoryurltip=(type)=>{ - if(type===1){ - this.setState({ - showrepositoryurltiptype:true - }) - }else{ - this.setState({ - showrepositoryurltiptype:false - }) - } - } - - evaluationonChange=(e,key)=>{ - let {evaluationlist}=this.state; - let newevaluationlist=evaluationlist; - let newtype; - if(e===1){ - newtype=0; - }else{ - newtype=1; - } - // newevaluationlist[key].is_public=newtype; - // for(var i=0; i{ - let {evaluationlist,scoretype}=this.state; - - if(scoretype===key){ - this.setState({ - scoretype:undefined - }) - } - let newevaluationlist=evaluationlist; - let sum =parseInt(e.target.value); - if(isNaN(sum)){ - sum=0 - } - newevaluationlist[key].score=sum; - - this.setState({ - evaluationlist:newevaluationlist, - markvalue:false - }) - this.setevaluationlist(newevaluationlist); - } - - evaluationoninputvalue=(e,key,type)=>{ - $.fn.autoHeight = function(){ - function autoHeight(elem){ - elem.style.height = 'auto'; - elem.style.maxHeight = '140px'; - elem.scrollTop = 0; //防抖动 - elem.style.height = elem.scrollHeight + 'px'; - } - this.each(function(){ - autoHeight(this); - $(this).on('keyup', function(){ - autoHeight(this); - }); - }); - } - $('textarea[autoHeight]').autoHeight(); - - let {evaluationlist}=this.state; - let newevaluationlist=evaluationlist; - if(type==="sr"){ - newevaluationlist[key].input=e.target.value - }else if(type==="yq"){ - newevaluationlist[key].output=e.target.value - } - this.setevaluationlist(newevaluationlist); - } - - - evaluationoninputvalueonload=()=>{ - $.fn.autoHeight = function(){ - function autoHeight(elem){ - elem.style.height = 'auto'; - elem.style.maxHeight = '140px'; - elem.scrollTop = 0; //防抖动 - elem.style.height = elem.scrollHeight + 'px'; - } - this.each(function(){ - autoHeight(this); - $(this).on('keyup', function(){ - autoHeight(this); - }); - }); - } - $('textarea[autoHeight]').autoHeight(); - } - submitarbitrationevaluation=()=>{ - let{evaluationlist,shixunfilepath,shixunfilepathplay,shixunfileexpectpicturepath,shixunfilestandardpicturepath,shixunfilepicturepath,pathoptionvalue,scorevalue,markvalue}=this.state; - - - let newscorevalue; - if(scorevalue===false){ - newscorevalue=false - }else{ - //判断占比 - newscorevalue=true - - let sum=0; - for(var i=0; i100){ - this.props.showSnackbar("测试集的评分占比不能大于100"); - this.setState({ - scoretype:i - }) - return - } - sum=sum+evaluationlist[i].score - } - - if(sum>100||sum<100){ - this.props.showSnackbar("测试集的评分占比之和必须等于100"); - return - } - - - } - if(shixunfilepath===undefined||shixunfilepath===""||shixunfilepath===null){ - this.props.showSnackbar("学员任务文件路径为空"); - this.setState({ - StudentTaskPapers:true - }) - $('html').animate({ - scrollTop: 120 - }, 1000); - return - } - - if(shixunfilepathplay===undefined||shixunfilepathplay===""||shixunfilepathplay===null){ - this.props.showSnackbar("评测执行文件路径为空"); - this.setState({ - StudentTaskDocs:true - }) - $('html').animate({ - scrollTop: 130 - }, 1000); - return - } - - if(evaluationlist.length===0){ - this.props.showSnackbar("测试集不能为空"); - return - } - let id = this.props.match.params.shixunId; - let{checkpointId}=this.state; - let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json"; - axios.put(url,{ - tab:1, - challenge:{ - path:shixunfilepath, - exec_path:shixunfilepathplay, - show_type:pathoptionvalue, - original_picture_path:shixunfileexpectpicturepath, - expect_picture_path:shixunfilestandardpicturepath, - picture_path:shixunfilepicturepath, - test_set_score:newscorevalue, - test_set_average:markvalue - }, - test_set:evaluationlist - } - ).then((response) => { - this.props.showSnackbar(response.data.messages); - // if(response.data.status===1){ - // window.location.href = "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3" - // } - }).catch((error) => { - console.log(error) - }); - } - handpathoptionvalues=()=>{ - this.setState({ - handpathopt:true - }) - } - handpathoptionvaluess=()=>{ - this.setState({ - handpathopt:false - }) - } - saveselectpath=(e)=>{ - - this.setState({ - selectpath:e.target.value - }) - } - updatepath=(e,name)=>{ - this.setState({ - [name]:e.target.value - }) - } - - - oneditevaluationlist=(newevaluationlist,markvalue)=>{ - - if(markvalue===true){ - if(100%newevaluationlist.length===0){ - let sum=100/newevaluationlist.length; - for(var i=0; i{ - - let {markvalue,evaluationlist}=this.state; - let newevaluationlist=evaluationlist; - - if(e.target.value===true){ - newevaluationlist=this.oneditevaluationlist(newevaluationlist,markvalue) - } - - this.setState({ - scorevalue: e.target.value, - evaluationlist:newevaluationlist - }); - - this.setevaluationlist(newevaluationlist); - } - - //均匀比例 - onChangemarkvalue=(e)=>{ - let {evaluationlist}=this.state; - - if(e.target.value===true){ - let newevaluationlist=evaluationlist; - newevaluationlist=this.oneditevaluationlist(newevaluationlist,e.target.value); - this.setevaluationlist(newevaluationlist); - } - - this.setState({ - markvalue: e.target.value, - }); - - } - render() { - - let { - choice_url, - practice_url, - go_back_url, - position, - evaluationlist, - shixunId, - checkpointId, - power, - shixunfileexpectpicturepath, - shixunfilestandardpicturepath, - shixunfilepicturepath, - shixunfilepath, - evaluationvisible, - trees, - path, - main, - selectpath, - shixunfilepathplay, - pathoptionvalue, - showrepositoryurltiptype, - prev_challenge, - next_challenge, - StudentTaskPapers, - StudentTaskDocs, - handpathopt, - scorevalue, - markvalue, - scoretype - } = this.state; - - let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint"; - let tab2url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/tab=2"; - let tab3url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/tab=3"; - // console.log(this.props) - const radioStyle = { - display: 'block', - height: '30px', - lineHeight: '30px', - marginLeft: '20px', - }; - return ( - -
      -
      - - - - 第{position}关 - 返回 - - {prev_challenge === undefined ? "" : - 上一关 - } - - {next_challenge === undefined ? "" : - 下一关 - } - - 3||this.props.identity===undefined||this.props.status===2||this.props.status===1? "none":'block'}} - data-tip-down="新增代码编辑类型的任务">+ 实践类型 - 3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}} - data-tip-down="新增选择题类型的任务">+ 选择题类型 - -
      - -
      - -
    • - 本关任务 -
      • - -
    • - 评测设置 -
      • - -
    • - 参考答案 -
      • -
      - -

      - 请先上传本关任务的所有代码文件、标准图片等所有必要的文件到 - 版本库 -

      - - -
      -
      -

      学员任务文件

      -
      - * -
      - this.updatepath(e,"shixunfilepath")} - onClick={(e)=>this.getfilepath(e,"shixunfilepath")} - /> -

      该文件将直接显示给学生，需要学生在其中填写代码

      -
      -
      - 必填项 -
      -
      -
      -
      - -
      -
      - -
      - - this.saveselectpath(e)} - value={selectpath}/> -
      - - this.evaluationenter()}>确定 - this.evaluationhideModal()}>取消 -
      -
      -       - -
      -
      -

      评测执行文件

      -
      - * -
      - this.updatepath(e,"shixunfilepathplay")} - onClick={(e)=>this.getfilepath(e,"shixunfilepathplay")} - /> -

      该文件由平台执行，用来测试平台学员代码是否正确

      -
      -
      - 必填项 -
      -
      -
      -
      - - -
      -
      -

      效果展现方式

      -
      - - this.showrepositoryurltip(1)}> -
      - -
      -

      - 图片：处理或输出图片类型的任务，请选题此项
      - 可以通过设置图片路径和学员答案文件路径，展示代码对应的图片效果

      - apk/exe：写可执行文件的任务，请选填此项
      - 可以通过设置学员答案文件路径，展示二维码以供扫码下载

      - txt：输出txt文档类型的任务，请选填此项
      - 可以通过学员答案文件路径设置，展示txt文件内容

      - html：web类型的任务，请选填此项
      - 可以通过Web路由设置，展示html效果预览页 -

      -

      this.showrepositoryurltip(2)} - >知道了 -

      -
      -
      -

      该选项用来配置学员评测本关任务时，查看效果页上需要展现的文件类型

      -
      -
      - - -
      -
      -

      待处理图片路径

      -
      -
      - this.updatepath(e,"shixunfileexpectpicturepath")} - onClick={(e)=>this.getfilepath(e,"shixunfileexpectpicturepath")} - /> -

      - 该路径下的文件将在学员评测本关任务时，作为原始图片显示在查看效果页，供学员参考,任务为图片处理时请指定该路径，并注意与程序文件所在文件夹分开 -

      -
      -
      -
      -
      -
      - - -
      -
      -

      标准答案图片路径

      -
      -
      - this.updatepath(e,"shixunfilestandardpicturepath")} - onClick={(e)=>this.getfilepath(e,"shixunfilestandardpicturepath")} - /> -

      - 该路径下的文件将在学员评测本关任务时，作为参考答案显示在查看效果页，供学员参考任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开 -

      -
      -
      -
      -
      -
      - - -
      -
      -

      学员答案文件路径

      -
      -
      - this.updatepath(e,"shixunfilepicturepath")} - onClick={(e)=>this.getfilepath(e,"shixunfilepicturepath")} - placeholder="请在版本库中指定用来保存学员代码实际输出结果的路径。例：src/step1/outputimages"/> -

      - 学员评测本关任务时生成的文件将保存在该路径下，并作为实际输出显示在查看效果页，供学员确认任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开 -

      -
      -
      -
      -
      -
      - - -
      -
      - {/*

      测试集

      */} -

      测试集和系统评分规则

      -

      - 得分规范： - - - 通过全部测试集 - （学员评测，仅当所有测试集都正确时，才获得一次性奖励） - - - 通过部分测试集 - （学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励） - -

      - -

      - - 系统评分占比： - - 均分比例 - 自定义比例 - - - -

      - -
      -
      - -
      - - {evaluationlist===undefined?"":evaluationlist.length===0?"":evaluationlist.map((item,key)=>{ - return( -
      -

      - * - 组{key+1} - - {/*checked={item.is_public===1?false:true}*/} - - this.editpercentage(e,key)} - value={item.score} /> - % - - - this.evaluationonChange(item.hidden,key)} checked={item.hidden===1?true:false}>隐藏 - - - - this.del_test_array(key)}> - - - -

      - - -
      - ) - })} - -
      -
      - -

      - - 新增测试集 - -

      -

      温馨提示：建议公开测试集和隐藏测试集结合使用，降低作弊的几率；隐藏测试集，在“提交评测”时也将被自动检测

      -
      -
      -
      - - -
      3||this.props.identity===undefined||power===false?"none":"block"}}> - 提交 - 取消 -
      - - -
      -       - ) - } -} - - +import React, {Component} from 'react'; + +import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Button,Icon,Tooltip} from 'antd'; + +import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom"; + +// import "antd/dist/antd.css"; + +import axios from 'axios'; + +import { getImageUrl, toPath } from 'educoder'; + +import './css/TPMchallengesnew.css'; + +import {getUrl} from 'educoder'; + +let origin = getUrl(); + +let path = getUrl("/editormd/lib/") + +const $ = window.$; + +let timeout; + +let currentValue; + +const Option = Select.Option; + +const RadioGroup = Radio.Group; + +function create_editorMD(id, width, high, placeholder, imageUrl, callback) { + var editorName = window.editormd(id, { + width: width, + height: high, + path: path, // "/editormd/lib/" + + syncScrolling: "single", + tex: true, + tocm: true, + emoji: true, + taskList: true, + codeFold: true, + searchReplace: true, + htmlDecode: "style,script,iframe", + sequenceDiagram: true, + autoFocus: false, + toolbarIcons: function () { + // Or return editormd.toolbarModes[name]; // full, simple, mini + // Using "||" set icons align right. + return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"] + }, + toolbarCustomIcons: { + testIcon: "
      ", + testIcon1: "
      " + }, + //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。 + saveHTMLToTextarea: true, + // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标 + dialogMaskOpacity: 0.6, + placeholder: placeholder, + imageUpload: true, + imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], + imageUploadURL: imageUrl,//url + onload: function () { + // this.previewing(); + $("#" + id + " [type=\"latex\"]").bind("click", function () { + editorName.cm.replaceSelection("```latex"); + editorName.cm.replaceSelection("\n"); + editorName.cm.replaceSelection("\n"); + editorName.cm.replaceSelection("```"); + var __Cursor = editorName.cm.getDoc().getCursor(); + editorName.cm.setCursor(__Cursor.line - 1, 0); + }); + + $("#" + id + " [type=\"inline\"]").bind("click", function () { + editorName.cm.replaceSelection("$$$$"); + var __Cursor = editorName.cm.getDoc().getCursor(); + editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2); + editorName.cm.focus(); + }); + $("[type=\"inline\"]").attr("title", "行内公式"); + $("[type=\"latex\"]").attr("title", "多行公式"); + + window.md_elocalStorage(editorName, `exercise__${id}`, "Memochallengesnew"); + + callback && callback() + } + }); + return editorName; +} + + +export default class TPMevaluation extends Component { + constructor(props) { + super(props) + this.state = { + choice_url: undefined, + practice_url: undefined, + go_back_url: undefined, + task_pass_default: undefined, + submit_url: undefined, + value: 1, + evaluationlist:[], + shixunId:undefined, + power:false, + shixunfilepath:undefined, + evaluationvisible:false, + trees:undefined, + path:"", + main:[], + saveshixunfilepath:undefined, + selectpath:undefined, + shixunfilepathplay:undefined, + shixunfileexpectpicturepath:undefined, + shixunfilestandardpicturepath:undefined, + shixunfilepicturepath:undefined, + pathoptionvalue:-1, + showrepositoryurltiptype: false, + prev_challenge: undefined, + next_challenge: undefined, + StudentTaskPapers:false, + StudentTaskDocs:false, + selectpatharr:[], + handpathopt:false, + scorevalue:false, + markvalue:true, + scoretype:undefined + } + } + + + exerciseMD(initValue, id) { + + this.contentChanged = false; + const placeholder = ""; +// amp; +// 编辑时要传memoId + const imageUrl = `/api/attachments.json`; +// 创建editorMd + + const exercise_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => { + setTimeout(() => { + exercise_editormd.resize() + exercise_editormd.cm && exercise_editormd.cm.refresh() + }, 500) + + if (initValue != undefined) { + exercise_editormd.setValue(initValue) + } + exercise_editormd.cm.on("change", (_cm, changeObj) => { + console.log('....contentChanged') + this.contentChanged = true; + }) + }); + this.exercise_editormd = exercise_editormd; + window.exercise_editormd = exercise_editormd; + + } + + componentDidMount() { + let id = this.props.match.params.shixunId; + let checkpointId=this.props.match.params.checkpointId; + this.setState({ + shixunId:id, + checkpointId:checkpointId + }) + let newchoice_url= "/shixuns/"+id+"/challenges/newquestion"; + let newpractice_url= "/shixuns/"+id+"/challenges/new"; + let newgo_back_url="/shixuns/"+id+"/challenges"; + + let url = "/shixuns/" + id + "/challenges/" + checkpointId + "/edit.json?tab=1"; + axios.get(url).then((response) => { + let newprev_challenge = response.data.prev_challenge; + let next_challenge = response.data.next_challenge; + if (newprev_challenge != undefined) { + if(newprev_challenge.st===0){ + newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint"; + }else{ + newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editquestion"; + } + } + if (next_challenge != undefined) { + + if(next_challenge.st===0){ + next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint"; + }else{ + next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion"; + } + } + let newevaluationlist=[] + if(response.data.test_sets.length===0){ + let newlist=[ + {hidden:0,input:"",output:"",score:50}, + {hidden:1,input:"",output:"",score:50} + ] + newevaluationlist=newlist + }else{ + newevaluationlist=response.data.test_sets + } + + this.setState({ + power: response.data.power, + evaluationlist:newevaluationlist, + shixunfilepath:response.data.path, + shixunfilepathplay:response.data.exec_path, + pathoptionvalue:response.data.show_type, + shixunfileexpectpicturepath:response.data.original_picture_path, + shixunfilestandardpicturepath:response.data.expect_picture_path, + shixunfilepicturepath:response.data.picture_path, + prev_challenge: newprev_challenge, + next_challenge: next_challenge, + choice_url: newchoice_url, // 导航中的新建选择题url + practice_url: newpractice_url, //string 导航中新建实践题url + go_back_url: newgo_back_url, //string 导航中的返回url + position: response.data.position, //int 关卡位置，导航栏中的第几关 + scorevalue:response.data.test_set_score, + markvalue:response.data.test_set_average, + }) + this.evaluationoninputvalueonload(); + if(response.data.power===false){ + this.props.showSnackbar("你没有权限修改"); + } + if(response.data.answer===undefined){ + this.answerMD("", "answerMD"); + }else{ + this.answerMD(response.data.answer, "answerMD"); + } + + }).catch((error) => { + console.log(error) + }); + + } + + + setevaluationlist=(newevaluationlist)=>{ + this.setState({ + evaluationlist:newevaluationlist + }) + } + + + addevaluationon=()=>{ + let {evaluationlist,markvalue}=this.state; + let newevaluationlist=evaluationlist; + newevaluationlist.push({hidden:0,input:"",output:"",score:0}); + newevaluationlist=this.oneditevaluationlist(newevaluationlist,markvalue); + this.setevaluationlist(newevaluationlist); + } + + del_test_array=(key)=>{ + let {evaluationlist,markvalue}=this.state; + let newevaluationlist=evaluationlist; + newevaluationlist.splice(key,1); + newevaluationlist=this.oneditevaluationlist(newevaluationlist,markvalue); + this.setevaluationlist(newevaluationlist); + } + + getfilepath=(e,shixunfilepath)=>{ + this.setState({ + evaluationvisible: true, + selectpath:e.target.value, + selectpatharr:[], + }); + let id = this.props.match.params.shixunId; + let url ="/shixuns/"+id+"/repository.json"; + axios.post(url,{ + path: "" + }).then((response) => { + if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { + + }else{ + this.setState({ + trees:response.data.trees, + saveshixunfilepath:shixunfilepath, + path:"", + main:[], + }) + } + + }).catch((error) => { + console.log(error) + }); + } + + sendgetfilepath=(newpath,type)=>{ + let id = this.props.match.params.shixunId; + let{path,main}=this.state; + let ary=main; + let paths=path; + + this.setState({ + selectpatharr:[], + }) + if(paths===""&&type==="tree"){ + newpath=newpath+"/"; + paths=""; + if(main.length===0){ + ary.push({val:"根目录/",path:""},{val:newpath,path:paths+newpath}) + }else{ + ary.push({val:newpath,path:paths+newpath}) + } + + }else if(paths!=""&&type==="tree"){ + newpath=newpath+"/"; + ary.push({val:newpath,path:paths+newpath}) + } + + + let url ="/shixuns/"+id+"/repository.json"; + if(type==="tree"){ + + axios.post(url,{ + path: paths+newpath + }).then((response) => { + if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { + + }else{ + this.setState({ + trees:response.data.trees, + path:paths+newpath, + main:ary, + // selectpath:"" + }) + } + + }).catch((error) => { + console.log(error) + }); + } + + } + + goblakepath=(path,key)=>{ + let {main,selectpath} =this.state; + let newmain=[] + for(var i=0;i<=key;i++){ + newmain.push(main[i]) + } + let id = this.props.match.params.shixunId; + let url ="/shixuns/"+id+"/repository.json"; + axios.post(url,{ + path: path + }).then((response) => { + if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { + + }else { + this.setState({ + trees: response.data.trees, + path: path, + main: newmain, + // selectpath:selectpath + }) + } + }).catch((error) => { + console.log(error) + }); + } + // delesavegetfilepath=(value)=>{ + // let {selectpatharr} = this.state + // let newarr =selectpatharr; + // let newselectpath=""; + // for(var i=0; i{ + let {selectpath} = this.state + // let newarr =selectpatharr; + // let arrtype=false; + // let arrsum=0; + // let newselectpath=""; + // newarr.push(value) + // if(newarr.length>1&&arrtype===false){ + // for(var i=0; i{ + let {saveshixunfilepath,selectpath}=this.state; + this.setState({ + evaluationvisible: false, + [saveshixunfilepath]:selectpath + }); + } + evaluationhideModal=()=>{ + this.setState({ + evaluationvisible: false, + }); + } + handpathoptionvalue=(value)=>{ + this.setState({ + pathoptionvalue:value + }) + } + showrepositoryurltip=(type)=>{ + if(type===1){ + this.setState({ + showrepositoryurltiptype:true + }) + }else{ + this.setState({ + showrepositoryurltiptype:false + }) + } + } + + evaluationonChange=(e,key)=>{ + let {evaluationlist}=this.state; + let newevaluationlist=evaluationlist; + let newtype; + if(e===1){ + newtype=0; + }else{ + newtype=1; + } + // newevaluationlist[key].is_public=newtype; + // for(var i=0; i{ + let {evaluationlist,scoretype}=this.state; + + if(scoretype===key){ + this.setState({ + scoretype:undefined + }) + } + let newevaluationlist=evaluationlist; + let sum =parseInt(e.target.value); + if(isNaN(sum)){ + sum=0 + } + newevaluationlist[key].score=sum; + + this.setState({ + evaluationlist:newevaluationlist, + markvalue:false + }) + this.setevaluationlist(newevaluationlist); + } + + evaluationoninputvalue=(e,key,type)=>{ + $.fn.autoHeight = function(){ + function autoHeight(elem){ + elem.style.height = 'auto'; + elem.style.maxHeight = '140px'; + elem.scrollTop = 0; //防抖动 + elem.style.height = elem.scrollHeight + 'px'; + } + this.each(function(){ + autoHeight(this); + $(this).on('keyup', function(){ + autoHeight(this); + }); + }); + } + $('textarea[autoHeight]').autoHeight(); + + let {evaluationlist}=this.state; + let newevaluationlist=evaluationlist; + if(type==="sr"){ + newevaluationlist[key].input=e.target.value + }else if(type==="yq"){ + newevaluationlist[key].output=e.target.value + } + this.setevaluationlist(newevaluationlist); + } + + + evaluationoninputvalueonload=()=>{ + $.fn.autoHeight = function(){ + function autoHeight(elem){ + elem.style.height = 'auto'; + elem.style.maxHeight = '140px'; + elem.scrollTop = 0; //防抖动 + elem.style.height = elem.scrollHeight + 'px'; + } + this.each(function(){ + autoHeight(this); + $(this).on('keyup', function(){ + autoHeight(this); + }); + }); + } + $('textarea[autoHeight]').autoHeight(); + } + submitarbitrationevaluation=()=>{ + let{evaluationlist,shixunfilepath,shixunfilepathplay,shixunfileexpectpicturepath,shixunfilestandardpicturepath,shixunfilepicturepath,pathoptionvalue,scorevalue,markvalue}=this.state; + + + let newscorevalue; + if(scorevalue===false){ + newscorevalue=false + }else{ + //判断占比 + newscorevalue=true + + let sum=0; + for(var i=0; i100){ + this.props.showSnackbar("测试集的评分占比不能大于100"); + this.setState({ + scoretype:i + }) + return + } + sum=sum+evaluationlist[i].score + } + + if(sum>100||sum<100){ + this.props.showSnackbar("测试集的评分占比之和必须等于100"); + return + } + + + } + if(shixunfilepath===undefined||shixunfilepath===""||shixunfilepath===null){ + this.props.showSnackbar("学员任务文件路径为空"); + this.setState({ + StudentTaskPapers:true + }) + $('html').animate({ + scrollTop: 120 + }, 1000); + return + } + + if(shixunfilepathplay===undefined||shixunfilepathplay===""||shixunfilepathplay===null){ + this.props.showSnackbar("评测执行文件路径为空"); + this.setState({ + StudentTaskDocs:true + }) + $('html').animate({ + scrollTop: 130 + }, 1000); + return + } + + if(evaluationlist.length===0){ + this.props.showSnackbar("测试集不能为空"); + return + } + let id = this.props.match.params.shixunId; + let{checkpointId}=this.state; + let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json"; + axios.put(url,{ + tab:1, + challenge:{ + path:shixunfilepath, + exec_path:shixunfilepathplay, + show_type:pathoptionvalue, + original_picture_path:shixunfileexpectpicturepath, + expect_picture_path:shixunfilestandardpicturepath, + picture_path:shixunfilepicturepath, + test_set_score:newscorevalue, + test_set_average:markvalue + }, + test_set:evaluationlist + } + ).then((response) => { + this.props.showSnackbar(response.data.messages); + // if(response.data.status===1){ + // window.location.href = "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3" + // } + }).catch((error) => { + console.log(error) + }); + } + handpathoptionvalues=()=>{ + this.setState({ + handpathopt:true + }) + } + handpathoptionvaluess=()=>{ + this.setState({ + handpathopt:false + }) + } + saveselectpath=(e)=>{ + + this.setState({ + selectpath:e.target.value + }) + } + updatepath=(e,name)=>{ + this.setState({ + [name]:e.target.value + }) + } + + + oneditevaluationlist=(newevaluationlist,markvalue)=>{ + + if(markvalue===true){ + if(100%newevaluationlist.length===0){ + let sum=100/newevaluationlist.length; + for(var i=0; i{ + + let {markvalue,evaluationlist}=this.state; + let newevaluationlist=evaluationlist; + + if(e.target.value===true){ + newevaluationlist=this.oneditevaluationlist(newevaluationlist,markvalue) + } + + this.setState({ + scorevalue: e.target.value, + evaluationlist:newevaluationlist + }); + + this.setevaluationlist(newevaluationlist); + } + + //均匀比例 + onChangemarkvalue=(e)=>{ + let {evaluationlist}=this.state; + + if(e.target.value===true){ + let newevaluationlist=evaluationlist; + newevaluationlist=this.oneditevaluationlist(newevaluationlist,e.target.value); + this.setevaluationlist(newevaluationlist); + } + + this.setState({ + markvalue: e.target.value, + }); + + } + render() { + + let { + choice_url, + practice_url, + go_back_url, + position, + evaluationlist, + shixunId, + checkpointId, + power, + shixunfileexpectpicturepath, + shixunfilestandardpicturepath, + shixunfilepicturepath, + shixunfilepath, + evaluationvisible, + trees, + path, + main, + selectpath, + shixunfilepathplay, + pathoptionvalue, + showrepositoryurltiptype, + prev_challenge, + next_challenge, + StudentTaskPapers, + StudentTaskDocs, + handpathopt, + scorevalue, + markvalue, + scoretype + } = this.state; + + let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint"; + let tab2url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/tab=2"; + let tab3url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/tab=3"; + // console.log(this.props) + const radioStyle = { + display: 'block', + height: '30px', + lineHeight: '30px', + marginLeft: '20px', + }; + return ( + +
      +
      + + + + 第{position}关 + 返回 + + {prev_challenge === undefined ? "" : + 上一关 + } + + {next_challenge === undefined ? "" : + 下一关 + } + + 3||this.props.identity===undefined||this.props.status===2||this.props.status===1? "none":'block'}} + data-tip-down="新增代码编辑类型的任务">+ 实践类型 + 3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}} + data-tip-down="新增选择题类型的任务">+ 选择题类型 + +
      + +
      + +
    • + 本关任务 +
      • + +
    • + 评测设置 +
      • + +
    • + 参考答案 +
      • +
      + +

      + 请先上传本关任务的所有代码文件、标准图片等所有必要的文件到 + 版本库 +

      + + +
      +
      +

      学员任务文件

      +
      + * +
      + this.updatepath(e,"shixunfilepath")} + onClick={(e)=>this.getfilepath(e,"shixunfilepath")} + /> +

      该文件将直接显示给学生，需要学生在其中填写代码

      +
      +
      + 必填项 +
      +
      +
      +
      + +
      +
      + +
      + + this.saveselectpath(e)} + value={selectpath}/> +
      + + this.evaluationenter()}>确定 + this.evaluationhideModal()}>取消 +
      +
      +       + +
      +
      +

      评测执行文件

      +
      + * +
      + this.updatepath(e,"shixunfilepathplay")} + onClick={(e)=>this.getfilepath(e,"shixunfilepathplay")} + /> +

      该文件由平台执行，用来测试平台学员代码是否正确

      +
      +
      + 必填项 +
      +
      +
      +
      + + +
      +
      +

      效果展现方式

      +
      + + this.showrepositoryurltip(1)}> +
      + +
      +

      + 图片：处理或输出图片类型的任务，请选题此项
      + 可以通过设置图片路径和学员答案文件路径，展示代码对应的图片效果

      + apk/exe：写可执行文件的任务，请选填此项
      + 可以通过设置学员答案文件路径，展示二维码以供扫码下载

      + txt：输出txt文档类型的任务，请选填此项
      + 可以通过学员答案文件路径设置，展示txt文件内容

      + html：web类型的任务，请选填此项
      + 可以通过Web路由设置，展示html效果预览页 +

      +

      this.showrepositoryurltip(2)} + >知道了 +

      +
      +
      +

      该选项用来配置学员评测本关任务时，查看效果页上需要展现的文件类型

      +
      +
      + + +
      +
      +

      待处理图片路径

      +
      +
      + this.updatepath(e,"shixunfileexpectpicturepath")} + onClick={(e)=>this.getfilepath(e,"shixunfileexpectpicturepath")} + /> +

      + 该路径下的文件将在学员评测本关任务时，作为原始图片显示在查看效果页，供学员参考,任务为图片处理时请指定该路径，并注意与程序文件所在文件夹分开 +

      +
      +
      +
      +
      +
      + + +
      +
      +

      标准答案图片路径

      +
      +
      + this.updatepath(e,"shixunfilestandardpicturepath")} + onClick={(e)=>this.getfilepath(e,"shixunfilestandardpicturepath")} + /> +

      + 该路径下的文件将在学员评测本关任务时，作为参考答案显示在查看效果页，供学员参考任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开 +

      +
      +
      +
      +
      +
      + + +
      +
      +

      学员答案文件路径

      +
      +
      + this.updatepath(e,"shixunfilepicturepath")} + onClick={(e)=>this.getfilepath(e,"shixunfilepicturepath")} + placeholder="请在版本库中指定用来保存学员代码实际输出结果的路径。例：src/step1/outputimages"/> +

      + 学员评测本关任务时生成的文件将保存在该路径下，并作为实际输出显示在查看效果页，供学员确认任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开 +

      +
      +
      +
      +
      +
      + + +
      +
      + {/*

      测试集

      */} +

      测试集和系统评分规则

      +

      + 得分规范： + + + 通过全部测试集 + （学员评测，仅当所有测试集都正确时，才获得一次性奖励） + + + 通过部分测试集 + （学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励） + +

      + +

      + + 系统评分占比： + + 均分比例 + 自定义比例 + + + +

      + +
      +
      + +
      + + {evaluationlist===undefined?"":evaluationlist.length===0?"":evaluationlist.map((item,key)=>{ + return( +
      +

      + * + 组{key+1} + + {/*checked={item.is_public===1?false:true}*/} + + this.editpercentage(e,key)} + value={item.score} /> + % + + + this.evaluationonChange(item.hidden,key)} checked={item.hidden===1?true:false}>隐藏 + + + + this.del_test_array(key)}> + + + +

      + + +
      + ) + })} + +
      +
      + +

      + + 新增测试集 + +

      +

      温馨提示：建议公开测试集和隐藏测试集结合使用，降低作弊的几率；隐藏测试集，在“提交评测”时也将被自动检测

      +
      +
      +
      + + +
      3||this.props.identity===undefined||power===false?"none":"block"}}> + 提交 + 取消 +
      + + +
      +       + ) + } +} + + From cb9c4d21154fd57fc601a9c6a013b7d8a15725a8 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 08:49:25 +0800 Subject: [PATCH 2/8] css --- .../src/modules/courses/exercise/new/NullChildEditor.js | 6 +++--- public/react/src/modules/courses/exercise/new/NullEditor.js | 2 +- .../react/src/modules/courses/exercise/new/SingleEditor.js | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/exercise/new/NullChildEditor.js b/public/react/src/modules/courses/exercise/new/NullChildEditor.js index a78028b20..434211f1d 100644 --- a/public/react/src/modules/courses/exercise/new/NullChildEditor.js +++ b/public/react/src/modules/courses/exercise/new/NullChildEditor.js @@ -39,14 +39,14 @@ class NullChildEditor extends Component{ let { question_title, question_score, question_type, question_choices, standard_answers } = this.state; let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish, answers } = this.props; - + // marginTop: '18px' return( -
      +
      答案(填空{index + 1}):
      { answers.map((item, itemIndex) => { - return
      + return
      diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js index 02efe2443..6120e9aea 100644 --- a/public/react/src/modules/courses/exercise/new/SingleEditor.js +++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js @@ -219,9 +219,10 @@ class SingleEditor extends Component{ } .optionRow { margin:0px!important; - margin-bottom: 20px!important; + /* margin-bottom: 20px!important; */ } .signleEditor .content_editorMd_show{ + display: flex; margin-top:0px!important; border-radius:2px; max-width: 1056px; From bbc689cc872fa64e3e954ceb9f1f9e81ba7c74e4 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 09:17:38 +0800 Subject: [PATCH 3/8] =?UTF-8?q?(=20=E6=95=B0=E6=8D=AE=E5=B7=B2=E4=BA=8E=20?= =?UTF-8?q?09:17:12=20=E4=BF=9D=E5=AD=98=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/tpm/challengesnew/TPMMDEditor.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js index 0f00d1c25..6967de008 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js +++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js @@ -80,8 +80,14 @@ function md_elocalStorage(editor,mdu,id){ md_add_data("content",mdu,editor.getValue()); var id1 = "#e_tip_"+id; var id2 = "#e_tips_"+id; - - $(id2).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存 "); + + var text = " 数据已于 " + h + ':' + m + ':' + s +" 保存 "; + // 占位符 + if ($(id2).html() && $(id2).html() != '　') { + $(id2).html( $(id2).html().split('　(')[0] + `　(${text})`); + } else { + $(id2).html(text); + } // $(id2).html(""); } },10000); From 341958003b1063f32687ed772dbf31c245af4d99 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 09:29:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/exercise/ExerciseNew.js | 14 +++++++++++++- .../modules/courses/exercise/new/NullDisplay.js | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js index 8bc7ed6ae..0e1489c72 100644 --- a/public/react/src/modules/courses/exercise/ExerciseNew.js +++ b/public/react/src/modules/courses/exercise/ExerciseNew.js @@ -342,6 +342,11 @@ class ExerciceNew extends Component{ this.editingId = null; this.fetchExercise() } + goToPreview = () => { + const exercise_id = this.props.match.params.Id + const courseId = this.props.match.params.coursesId + this.props.history.push(`/courses/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`) + } render() { let { exercise_name, exercise_description, course_id, exercise_types, exercise_questions, left_banner_id } = this.state; @@ -366,6 +371,8 @@ class ExerciceNew extends Component{ const isAdmin = this.props.isAdmin() const courseId=this.props.match.params.coursesId; + const exercise_id = this.props.match.params.Id + const isEdit = this.isEdit const commonHandler = { onQestionDelete: this.onQestionDelete, @@ -395,7 +402,7 @@ class ExerciceNew extends Component{ background: #fff; } .exerciseNew .markdown-body { - max-width: 1088px; + max-width: 1128px; } `}
      @@ -546,6 +553,11 @@ class ExerciceNew extends Component{ this.addShixun(null)}> 实训题 + + {exercise_id && this.goToPreview()}> + {/* */} + 试卷预览 + }
      }
      diff --git a/public/react/src/modules/courses/exercise/new/NullDisplay.js b/public/react/src/modules/courses/exercise/new/NullDisplay.js index e507829ed..e5c604767 100644 --- a/public/react/src/modules/courses/exercise/new/NullDisplay.js +++ b/public/react/src/modules/courses/exercise/new/NullDisplay.js @@ -80,12 +80,14 @@ class NullDisplay extends Component{ .answers .answer { background: #EDEDED; color: #C5C5C5; - width: 100%; + display: inline-block; line-height: 16px; padding:12px 10px; margin-bottom:10px; border-radius:2px; + max-width: 1024px; + word-break: break-all; } .answerRow { padding: 1px 0; From d462e2c57a15a45c79fede313e1835561a9e84a7 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 09:45:12 +0800 Subject: [PATCH 5/8] max={10} --- public/react/src/modules/courses/busyWork/NewWork.js | 2 +- .../src/modules/courses/exercise/ExerciseDisplay.js | 11 +++++++---- .../src/modules/courses/exercise/new/SingleDisplay.js | 2 +- .../react/src/modules/courses/exercise/new/common.css | 4 ++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js index a6fc93c92..c30832c8f 100644 --- a/public/react/src/modules/courses/busyWork/NewWork.js +++ b/public/react/src/modules/courses/busyWork/NewWork.js @@ -477,7 +477,7 @@ class NewWork extends Component{ ~ {/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) } */} - diff --git a/public/react/src/modules/courses/exercise/ExerciseDisplay.js b/public/react/src/modules/courses/exercise/ExerciseDisplay.js index 5992210b4..4da4768d2 100644 --- a/public/react/src/modules/courses/exercise/ExerciseDisplay.js +++ b/public/react/src/modules/courses/exercise/ExerciseDisplay.js @@ -69,20 +69,23 @@ class ExerciseDisplay extends Component{ return(
      -
      +
      {exercise&&exercise.exercise_name}
      -
      {exercise&&exercise.exercise_description}
      +
      {exercise&&exercise.exercise_description}
      -
      +

      { exercise_types && exercise_types.q_singles > 0 && diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js index 8973d53db..453cce229 100644 --- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js +++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js @@ -71,7 +71,7 @@ class SingleDisplay extends Component{ let length = 5; const qName = qNameArray[question_type] return( -

      +
      @@ -269,7 +275,10 @@ class UseBank extends Component{ - 14 && item.course_list_name} className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name} + 14 && item.course_list_name} + className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5 bankwidth":"fl with30 color-grey-6 task-hide pl5 bankwidth"} + + >{item.course_list_name} { nav_my==='public' && {item.username} diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 423632d89..aec7ca390 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -272,9 +272,11 @@ class Coursesleftnav extends Component{ debugger let {url}=this.state; if(urls!=url){ + debugger this.props.history.replace(urls); this.props.updataleftNavfun(); }else{ + debugger if (key === this.props.indexs) { this.props.unlocationNavfun(undefined) } else { diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js index f3212d9bd..097d55053 100644 --- a/public/react/src/modules/courses/coursesPublic/Addcourses.js +++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js @@ -1,5 +1,5 @@ import React,{ Component } from "react"; -import { Modal,Checkbox,Input} from "antd"; +import { Modal,Checkbox,Input, Spin, Icon } from "antd"; import axios from 'axios'; import Modals from '../../modals/Modals'; const CheckboxGroup = Checkbox.Group; @@ -23,6 +23,7 @@ class Addcourses extends Component{ modalsType:false, modalsTopval:undefined, modalSave:undefined, + isSpin:false } } @@ -144,17 +145,22 @@ class Addcourses extends Component{ } submittojoinclass=()=>{ + this.setState({ + isSpin:true + }) let {invite_code,professor,assistant_professor,student}=this.state; if(invite_code===undefined||invite_code===""){ this.setState({ invite_codetype:true, - invite_codevalue:"邀请码不能为空" + invite_codevalue:"邀请码不能为空", + spinning:false }) return }else{ this.setState({ invite_codetype:false, - invite_codevalue:" " + invite_codevalue:" ", + spinning:false }) } @@ -178,7 +184,12 @@ class Addcourses extends Component{ // // modalSave:this.submitasyn, // course_id:response.data.course_id // }) - this.submitasyn(response.data.course_id) + if(response.data.course_id!=undefined){ + this.submitasyn(response.data.course_id) + } + this.props.hideAddcoursestype(); + + this.props.showNotification(response.data.message); }else{ this.setState({ Addcoursestype:false @@ -193,8 +204,15 @@ class Addcourses extends Component{ // course_id:undefined // }) } + + this.setState({ + spinning:false + }) }).catch((error) => { console.log(error) + this.setState({ + spinning:false + }) }) // if(value===0){ @@ -258,7 +276,7 @@ class Addcourses extends Component{ modalsTopval, modalSave }=this.state; - + const antIcon = ; return(
      +
        @@ -331,6 +350,7 @@ class Addcourses extends Component{
      +
      ) diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index eb0377022..70df3f577 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -167,7 +167,7 @@ class ExerciseListItem extends Component{ { IsAdmin && } diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 4af1aa6ef..a2ddb242a 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -811,7 +811,7 @@ submittojoinclass=(value)=>{ closable={false} footer={null} > -
      +
      • diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 1ae9e34fb..fff1ce231 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -123,13 +123,13 @@ export function TPMIndexHOC(WrappedComponent) { componentDidMount() { if(this.props.match.path==="/"){ - document.title="创新源于实践"; + document.title="创新源于实践"; }else if(this.props.match.path==="/403"){ - document.title="你没有权限访问"; + document.title="你没有权限访问"; }else if(this.props.match.path==="/nopage"){ document.title="没有找到该页面"; }else if(this.props.match.path==="/shixuns"){ - document.title="开发社区"; + document.title="开发社区"; }else if(this.props.match.path==="/paths"){ document.title="实训课程"; }else if(this.props.match.path==="/courses"){