dev_forum
杨树明 6 years ago
parent ca2e882337
commit 5c8bdefab8

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

@ -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}`
}

@ -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`

@ -169,7 +169,8 @@ class Fileslistitem extends Component{
margin-top: 0px;
}
`}</style>
{checkBox}
<style>{`
.boardsList .panel-list-img {
width: 50px;
@ -197,7 +198,9 @@ class Fileslistitem extends Component{
`}</style>
<div className="clearfix ds pr contentSection">
<h6>
<span className="fl mr12 mt3">
{checkBox}
</span>
{
this.props.isAdmin ? <a
// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
@ -263,7 +266,7 @@ class Fileslistitem extends Component{
}
</style>
{discussMessage.course_groups.length===0?"":
<p className="color-grey panel-lightgrey mt8 fl lightgreybox" style={{width:'100%'}}>
<p className="color-grey panel-lightgrey mt8 fl lightgreybox ml30" style={{width:'100%'}}>
{discussMessage.course_groups.map((item,key)=>{
return(
<div className="mr50">
@ -275,7 +278,7 @@ class Fileslistitem extends Component{
</p>}
<p className="color-grey panel-lightgrey mt8 fl" style={{width:'100%'}}>
<p className="color-grey panel-lightgrey mt8 fl ml30" style={{width:'100%'}}>
<span className="mr50">
<span className="mr15 color-dark">{discussMessage.author.login}</span>
<span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
@ -290,7 +293,7 @@ class Fileslistitem extends Component{
</span>
</span>
{this.props.isAdmin ||this.props.current_user.login===discussMessage.author.login?
<span className={"fr mrf2"}>
<span className={"fr mrf2 mr10"}>
<WordsBtn style="blue" className="colorblue font-16 mr20 fr">
<a className="btn colorblue"
@ -307,14 +310,15 @@ class Fileslistitem extends Component{
<p className="color-grey panel-lightgrey mt8 fl" style={{width:'100%'}}>
<span className="mr50">
{/*<span className="mr15 color-dark"></span>*/}
<span className="mr15 color-dark">
<pre>资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}</pre>
</span>
{/*{this.props.isAdmin ?<span><i className="iconfont icon-bianjidaibeijing font-22 color-green" onClick={()=>this.settingList()}></i></span>:""}*/}
</span>
<p className="color-grey panel-lightgrey mt8 fl ml30" style={{width:'100%'}}>
<pre className="color-dark">资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}</pre>
{/*<span className="mr50">*/}
{/*/!*<span className="mr15 color-dark"></span>*!/*/}
{/*<span className="mr15 color-dark">*/}
{/*</span>*/}
{/*/!*{this.props.isAdmin ?<span><i className="iconfont icon-bianjidaibeijing font-22 color-green" onClick={()=>this.settingList()}></i></span>:""}*!/*/}
{/*</span>*/}
</p>

@ -454,10 +454,19 @@ class CoursesBanner extends Component {
</div>
<style>
{
`
.teachersbox{
margin-right:28px !important;
}
`
}
</style>
<div className="clearfix clearfixborder">
<ul className="fl color-grey-eb pathInfo pathInfobox mt10">
<li className={"mt7"}>
<li className={"mt7 teachersbox"} >
<Link to={"/courses/"+this.props.match.params.coursesId+"/teachers"}>
<span className="color-grey-c fl font-16">教师</span>
<span

@ -269,7 +269,7 @@ class Coursesleftnav extends Component{
}
selectnavid=(e,key,id,type,urls,index)=>{
debugger
let {url}=this.state;
if(urls!=url){
this.props.history.replace(urls);
@ -678,6 +678,7 @@ class Coursesleftnav extends Component{
}
showsandians=(e,key,urls,num)=> {
debugger
let {url}=this.state;
if (key === this.props.indexs) {
this.props.unlocationNavfun(undefined)

@ -235,10 +235,10 @@ class Associationmodel extends Component{
paddingLeft:'0px'
}}>
<div style={{
<div className={"font-16"} style={{
margin:'0px 20%'
}}>
你当前尚未管理任何项目请先 <span><a style={{color:'#1890ff'}} href={"/projects/new"}>创建项目</a> </span>
你当前尚未管理任何项目请先 <span><a className={"font-16"} style={{color:'#1890ff'}} href={"/projects/new"} target="_blank">创建项目</a> </span>
</div>
</div>}

@ -475,7 +475,7 @@ class Selectsetting extends Component{
`}</style>
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
<li className="fl" style={{width: '241px'}}>
<span className={"isabox"}> {datalist&&datalist.title} </span>
<span className={"isabox"} title={datalist&&datalist.title}> {datalist&&datalist.title} </span>
{datalist&&datalist.attachment_histories.length===0?"":<span className={"newcolor-orange fl"}>当前版本</span>}
</li>
<li className="fl edu-txt-left task-hide paddingl5 "
@ -490,7 +490,7 @@ class Selectsetting extends Component{
return(
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
<li className="fl" style={{width: '241px'}}>
<span className={"isabox"}> {item.title} </span>
<span className={"isabox"} title={item.title}> {item.title} </span>
{/*<span className={"newcolor-orange fl"}>当前版本</span>*/}
</li>
<li className="fl edu-txt-left task-hide paddingl5 "

@ -197,6 +197,13 @@ class GraduateTaskItem extends Component{
{/*
style={{borderTop:data===undefined?"":data.course_identity<4?'1px solid #EBEBEB':'1px solid transparent'}}
*/}
{
this.props.isAdmin?"":<style>{`
.boardsList .contentSection {
margin-left: 0px !important;
}
`}</style>}
<div className="clearfix ds pr pt5 contentSection" >
<style>{`
@ -297,7 +304,7 @@ class GraduateTaskItem extends Component{
{item==="提交作品"?
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt12">
<WordsBtn style="blue" className="colorblue font-16 ml20 fr mt12">
<a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/"+this.props.taskid+"/works/new"}>提交作品</a>
</WordsBtn>
@ -305,7 +312,7 @@ class GraduateTaskItem extends Component{
{item==="补交作品"?
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt12">
<WordsBtn style="blue" className="colorblue font-16 ml20 fr mt12">
<a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/"+this.props.taskid+"/works/new"}>补交作品</a>
</WordsBtn>
@ -313,7 +320,7 @@ class GraduateTaskItem extends Component{
{item==="修改作品"?
<WordsBtn style="blue" className="font-16 colorblue mr20 fr mt12">
<WordsBtn style="blue" className="font-16 colorblue ml20 fr mt12">
<a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/"+this.props.workid+"/works/edit"}>修改作品</a>
</WordsBtn>
@ -321,7 +328,7 @@ class GraduateTaskItem extends Component{
{item==="查看作品"?
<WordsBtn style="blue" className="font-16 colorblue mr20 fr mt12">
<WordsBtn style="blue" className="font-16 colorblue ml20 fr mt12">
<a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.workid+"/appraise"}>查看作品</a>
</WordsBtn>
@ -329,7 +336,7 @@ class GraduateTaskItem extends Component{
{item==="创建项目"?
<WordsBtn className="colorblue font-16 mr20 fr mt12">
<WordsBtn className="colorblue font-16 ml20 fr mt12">
<a className="btn colorblue" href={'https://testbdweb.educoder.net/projects/new'}>创建项目</a>
</WordsBtn>
@ -337,20 +344,20 @@ class GraduateTaskItem extends Component{
{item==="关联项目"?
<WordsBtn onClick={this.AssociationItems} className="colorblue font-16 mr20 fr mt12">关联项目</WordsBtn>
<WordsBtn onClick={this.AssociationItems} className="colorblue font-16 ml20 fr mt12">关联项目</WordsBtn>
:""}
{item==="取消关联"?
<WordsBtn onClick={this.cannelAssociation} className="colorblue font-16 mr20 fr mt12">取消关联</WordsBtn>
<WordsBtn onClick={this.cannelAssociation} className="colorblue font-16 ml20 fr mt12">取消关联</WordsBtn>
:""}
{item==="补交附件"?
<WordsBtn className="colorblue font-16 mr20 fr mt12" onClick={this.addAccessory}>
<WordsBtn className="colorblue font-16 ml20 fr mt12" onClick={this.addAccessory}>
补交附件
{/*<a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}></a>*/}
</WordsBtn>

@ -116,7 +116,7 @@ class GraduationTaskssettinglist extends Component{
id: worklists[i].id,
status:worklists[i].status
}, {name:"评阅", id: worklists[i].id, status:worklists[i].status}]:[{name:"", id: worklists[i].id,
status:worklists[i].status}],
status:worklists[i].status,view_work:worklists[i].view_work}],
})
}
}
@ -740,7 +740,7 @@ class GraduationTaskssettinglist extends Component{
className:'edu-txt-center',
render: (text, record) => (
<span>
<Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅": <pre>
<Tooltip placement="bottom" title={record.finalscore.work_score==="--"?"未评阅": <pre>
{record.finalscore.final_score.username}({record.finalscore.final_score.login})<br/>
{record.finalscore.ultimate_score===true?"":"教师评分:"+record.finalscore.teacher_comment_score+"分"}<br/>
{record.finalscore.cross_comment_score===undefined?"":"交叉评分:"+record.finalscore.cross_comment_score+"分"+<br/>}
@ -784,7 +784,7 @@ class GraduationTaskssettinglist extends Component{
operation.map((tag,key) => {
return(
<div key={key}>
{tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
{tag.view_work===false?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
</div>
)}
):""

@ -663,7 +663,7 @@ class GraduationTasks extends Component{
<div style={{"display":"inline-block", "marginTop": "22px"}}>
<span>{all_count}个毕设任务</span>
<span style={{"marginLeft":"16px"}}>已发布{this.state.published_count}</span>
{this.props.isAdmin()?<span style={{"marginLeft":"16px"}}>未发布{this.state.unpublished_count}</span>:""}
<span style={{"marginLeft":"16px"}}>未发布{this.state.unpublished_count}</span>
</div>
}

@ -1753,7 +1753,7 @@ class Listofworks extends Component {
{/*<a className="fr color-blue font-16" href={`/courses/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/commitsummary`}>提交总结</a>*/}
{this.props.isAdmin() ?
this.state.code_review === true ?
this.state.code_review === false ?
""
: <a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a> : ""}
</div>

@ -1,6 +1,6 @@
import React, {Component} from "react";
import {WordsBtn} from 'educoder';
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip} from "antd";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Spin} from "antd";
import {Link,Switch,Route,Redirect} from 'react-router-dom';
import axios from 'axios';
import ConclusionEvaluation from './shixunreport/ConclusionEvaluation';
@ -24,20 +24,27 @@ class ShixunWorkReport extends Component {
constructor(props) {
super(props);
this.state = {
data:undefined
data:undefined,
spinning:true
}
}
componentDidMount() {
this.setState({
spinning:true
})
let homeworkid=this.props.match.params.homeworkid;
let url = `/student_works/${homeworkid}/shixun_work_report.json`
axios.get(url).then((result) => {
this.setState({
data:result.data
data:result.data,
spinning:false
})
}).catch((error) => {
console.log(error)
this.setState({
spinning:false
})
})
let query = this.props.location.pathname;
const type = query.split('/');
@ -51,8 +58,10 @@ class ShixunWorkReport extends Component {
let category_id=data===undefined?"":data.category.category_id;
let homework_common_id=data===undefined?"":data.homework_common_id;
let homeworkid=this.props.match.params.homeworkid;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
return (
data===undefined?"":<div className="newMain clearfix ">
data===undefined?"":<Spin indicator={antIcon} spinning={this.state.spinning}><div className="newMain clearfix ">
<div className={"educontent mb20" }>
<div className="educontent">
<p className="clearfix mt20">
@ -166,6 +175,7 @@ class ShixunWorkReport extends Component {
</style>
{
data&&data.shixun_detail===undefined?"":data.shixun_detail.map((item,key)=>{
// console.log(item)
return(
<div key={key} className={"mb20"}>
<div className="font-16 color-dark-21 ml20 mr20">
@ -185,7 +195,7 @@ class ShixunWorkReport extends Component {
/>
</div>
{item.st===0?<div className="font-16 color-dark-21 ml20 mr20">
{item.st===0?item.passed_code===null?"":<div className="font-16 color-dark-21 ml20 mr20">
<div className="bor-grey-e mt15">
<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
<span className="fl">最近通过的代码</span>
@ -223,6 +233,7 @@ class ShixunWorkReport extends Component {
</div>
</div>
</Spin>
)
}

@ -346,8 +346,19 @@ class ShixunhomeWorkItem extends Component{
</p>
{this.props.isAdmin?<div className="homepagePostSetting" style={{"right":"4px","top":"44px","display":"block","width":"192px"}}>
<style>
{
`
.homepagePostSettingname{
width:192px !important;
}
.homepagePostSettingbox{
width:121px !important;
}
`
}
</style>
{this.props.isAdmin?<div className={this.props.isClassManagement?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
<a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
{this.props.isClassManagement?<a onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
<WordsBtn className="btn colorblue ml20 font-16" to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings`} > 设置</WordsBtn>

@ -1708,7 +1708,7 @@ class Trainingjobsetting extends Component {
<a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a> : "": ""}
{this.props.isAdmin()?
this.state.code_review===true?<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
this.state.code_review===false?<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
: "":""}
</div>
</div>

@ -421,7 +421,7 @@ class Workquestionandanswer extends Component {
{this.props.isAdmin()?
this.state.code_review===true?
this.state.code_review===false?
<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
:"":""}

@ -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{
{/*<WordsBtn style="blue" onClick={()=>this.editname(datas&&datas.main_category_name)} className={"mr30"}>目录重命名</WordsBtn>*/}
</span>:
<WordsBtn style="blue" onClick={()=>this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:""}
{this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr20 font-16" onClick={this.createCommonpath}>选用实训课程</WordsBtn>:"":""}
{this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr30 font-16" onClick={this.createCommonpath}>选用实训课程</WordsBtn>:"":""}
{this.props.isAdmin()===true?<a className={"btn colorblue font-16"} onClick={()=>this.createCommonWork()}>选用实训</a>:""}
</li>
</p>
@ -1085,7 +1085,7 @@ class ShixunHomework extends Component{
<div style={{"display":"inline-block", "marginTop": "22px"}}>
<span> {datas&&datas.all_count}个实训作业</span>
<span style={{"marginLeft":"16px"}}>已发布{datas&&datas.published_count}</span>
{this.props.isAdmin()?<span style={{"marginLeft":"16px"}}>未发布 {datas&&datas.unpublished_count}</span>:""}
<span style={{"marginLeft":"16px"}}>未发布 {datas&&datas.unpublished_count}</span>
</div>
</p>
<div className="fl mt6 task_menu_ul">

@ -1,6 +1,6 @@
import React, {Component} from "react";
import {WordsBtn} from 'educoder';
import {Table} from "antd";
import {Table,Tooltip,} from "antd";
import {Link,Switch,Route,Redirect} from 'react-router-dom';
class ConclusionEvaluation extends Component {
@ -39,7 +39,13 @@ class ConclusionEvaluation extends Component {
key: 'grade',
render: (text, record) => (
<span>
<span style={{color:'#FF6800'}}>{record.grade.minute}</span><span className={"color-grey-9"}>/{record.grade.minute}</span>
<Tooltip placement="bottom" title={
<pre>
分数{record.grade.minute}/总分{record.grade.total}
</pre>
}>
<span style={{color:'#FF6800'}}>{record.grade.minute}</span><span className={"color-grey-9"}>/{record.grade.total}</span>
</Tooltip>
</span>
),
}, {

@ -18,6 +18,7 @@ class Coursesshixundetails extends Component {
render() {
let {data}=this.props;
// console.log(data)
let columns=[{
title: '评测次数',
dataIndex: 'number',
@ -56,7 +57,7 @@ class Coursesshixundetails extends Component {
}
`}</style>
{data&&data?<Table
{data&&data? data.length===0?"":<Table
bordered
dataSource={datas}
columns={columns}

@ -787,7 +787,7 @@ submittojoinclass=(value)=>{
<li><Link to={"/courses/new"}>新建课堂</Link></li>
<li><a href="/shixuns/new">新建实训</a></li>
<li><a href={this.props.Headertop===undefined?"":"/paths/new"}>新建实训课程</a></li>
<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.new_project_url}>新建项目</a></li>
<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.new_project_url} target="_blank">新建项目</a></li>
</ul>
<ul className="fl with50 edu-txt-center">

@ -402,7 +402,10 @@ export default class TPMevaluation extends Component {
// for(var z=0; z<newarr.length;z++){
// newselectpath=newselectpath+newarr[z]+ ""
// }
let newselectpath=selectpath+value+ ""
// let newselectpath=selectpath+value+ ""
let newselectpath=value
this.setState({
// selectpatharr:newarr,
selectpath: newselectpath,

Loading…
Cancel
Save