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

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
chromesetting
cxt 5 years ago
parent f759b23649 db8b54fe43
commit cb6df30b5d
9 changed files with 126 additions and 122 deletions
Show Stats Download Patch File Download Diff File

2
app/services/homeworks_service.rb
Unescape View File

@ -346,7 +346,7 @@ class HomeworksService
work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) unless work.ultimate_score
#logger.info("#############work_score: #{score}")
work.calculation_time = Time.now
work.save!
work.save(validate: false)
end
end
end

3
public/react/src/AppConfig.js
Unescape View File

@ -35,7 +35,7 @@ if (isDev) {
// 老师
//ebugType="teacher";
// 学生
// debugType="student";
//debugType="student";
window._debugType = debugType;
export function initAxiosInterceptors(props) {
@ -52,7 +52,6 @@ export function initAxiosInterceptors(props) {
//proxy="http://47.96.87.25:48080"
proxy="https://pre-newweb.educoder.net"
proxy="https://test-newweb.educoder.net"
proxy="https://test-jupyterweb.educoder.net"
//proxy="http://192.168.2.63:3001"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

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

@ -61,6 +61,9 @@ class Listofworksstudentone extends Component {
//要提交的分班状态checkedValuesineinfo
//searchtext 输入的姓名和学号
//order 排序时间
//当前成绩work_score
//关卡得分final_score
this.state = {
jobsettingsdata: undefined,
endTime: "2018/11/10 17:10:00",
@ -382,10 +385,11 @@ class Listofworksstudentone extends Component {
},
{
title:<span>关卡得分<Tooltip placement="top" title={<pre>
截止前学员完成的关卡才有成绩<br/>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
width: '99px',
@ -393,19 +397,19 @@ class Listofworksstudentone extends Component {
<span style={{
width: '99px',
}}>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
color: '#747A7F',
textAlign: "center",
width: '99px',
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -459,26 +463,26 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'work_score',
key: 'work_score',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{width: '99px',}}>
{
record.levelscore && record.levelscore === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
record.work_score && record.work_score === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.work_score}</span>
:
<span style={parseInt(record.levelscore) >= 90 ? {
<span style={parseInt(record.work_score) >= 90 ? {
color: '#DD1717',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) <= 60 ? {
} : parseInt(record.work_score) <= 60 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score}</span>
}
</span>
@ -774,10 +778,11 @@ class Listofworksstudentone extends Component {
},
{
title:<span>关卡得分<Tooltip placement="top" title={<pre>
截止前学员完成的关卡才有成绩<br/>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
width: '99px',
@ -785,19 +790,19 @@ class Listofworksstudentone extends Component {
<span style={{
width: '99px',
}}>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
color: '#747A7F',
textAlign: "center",
width: '99px',
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -851,26 +856,26 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'work_score',
key: 'work_score',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{width: '99px',}}>
{
record.levelscore && record.levelscore === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
record.work_score && record.work_score === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.work_score}</span>
:
<span style={parseInt(record.levelscore) >= 90 ? {
<span style={parseInt(record.work_score) >= 90 ? {
color: '#DD1717',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) <= 60 ? {
} : parseInt(record.work_score) <= 60 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score}</span>
}
</span>
@ -1120,24 +1125,25 @@ class Listofworksstudentone extends Component {
},
{
title:<span>关卡得分<Tooltip placement="top" title={<pre>
截止前学员完成的关卡才有成绩<br/>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
render: (text, record) => (
<span>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
"text-align": "center"
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
"text-align": "center"
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
color: '#747A7F',
"text-align": "center"
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -1195,8 +1201,8 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'finalscore',
key: 'finalscore',
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
className: 'font-14',
sorter: true,
@ -1208,35 +1214,35 @@ class Listofworksstudentone extends Component {
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
"text-align": "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
"text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
color: '#747A7F',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
:
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.final_score === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.final_score}分</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
<span>效率评分：{record.efficiencyscore}分</span>}</div>
@ -1246,27 +1252,27 @@ class Listofworksstudentone extends Component {
{answer_open_evaluation===true?"":<div>查看参考答案：{record.view_answer_count}关</div>}
<div>{record.finalscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
"text-align": "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
"text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
color: '#747A7F',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
@ -1480,24 +1486,25 @@ class Listofworksstudentone extends Component {
},
{
title:<span>关卡得分<Tooltip placement="top" title={<pre>
截止前学员完成的关卡才有成绩<br/>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
render: (text, record) => (
<span>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
textAlign: "center"
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -1555,8 +1562,8 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'finalscore',
key: 'finalscore',
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
className: 'font-14',
sorter: true,
@ -1568,35 +1575,35 @@ class Listofworksstudentone extends Component {
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
textAlign: "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
:
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.final_score === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.final_score}分</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
<span>效率评分：{record.efficiencyscore}分</span>}</div>
@ -1606,27 +1613,27 @@ class Listofworksstudentone extends Component {
{answer_open_evaluation===true?"":<div>查看参考答案：{record.view_answer_count}关</div>}
<div>{record.finalscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
textAlign: "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
@ -1803,7 +1810,7 @@ class Listofworksstudentone extends Component {
Getalistofworks = (homeworkid, bool) => {
// console.log("获取作品列表");
// console.log("935");
// debugger
// debugger111111111111111
let searchtype = this.props.history.location.search;
let urll = `/homework_commons/${homeworkid}/works_list.json`;
var datasysl = {
@ -1816,16 +1823,9 @@ class Listofworksstudentone extends Component {
course_group: this.state.checkedValuesineinfo,
}
axios.post(urll, datasysl).then((result) => {
// console.log("980000000____________________");
if (result === undefined) {
return
}
// if(result.data.message!==undefined){
//
// return;
// }
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
@ -1884,7 +1884,7 @@ class Listofworksstudentone extends Component {
// 获取作品列表
Getalistofworkstwo = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
// console.log("获取作品列表");
// console.log("获取作品列表");222222222222
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json`;
// console.log(homeworkid);
@ -2078,7 +2078,8 @@ class Listofworksstudentone extends Component {
levelscore: teacherdata.final_score,
view_answer_count: teacherdata.view_answer_count,
efficiencyscore: teacherdata.eff_score,
finalscore: teacherdata.work_score,
final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score,
work_score: teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score,
operating: "查看",
late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty,
ultimate_score: teacherdata.ultimate_score,
@ -2119,8 +2120,9 @@ class Listofworksstudentone extends Component {
updatetime: timedata === "Invalid date" ? "--" : timedata,
completion: student_works[i].complete_count === null ? "0" : student_works[i].complete_count === undefined ? "0" : student_works[i].complete_count,
levelscore: student_works[i].final_score,
final_score: student_works[i].final_score=== null ||student_works[i].final_score=== undefined||student_works[i].final_score=== ""?"--":student_works[i].final_score,
work_score: student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score,
efficiencyscore: student_works[i].eff_score === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score,
finalscore: student_works[i].work_score,
view_answer_count: student_works[i].view_answer_count,
operating: "查看",
late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,
@ -2281,7 +2283,8 @@ class Listofworksstudentone extends Component {
levelscore: teacherdata.final_score,
efficiencyscore: teacherdata.eff_score,
view_answer_count: teacherdata.view_answer_count,
finalscore: teacherdata.work_score,
final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score,
work_score:teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score,
operating: "查看",
late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty,
ultimate_score: teacherdata.ultimate_score,
@ -2417,7 +2420,7 @@ class Listofworksstudentone extends Component {
}
Startsorting = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
// console.log("获取作品列表Listofworksstudenttwo");
// console.log("获取作品列表Listofworksstudenttwo");33333333
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json`;
// console.log(homeworkid);
@ -2538,7 +2541,7 @@ class Listofworksstudentone extends Component {
//searchtext 输入的姓名和学号
//order 排序时间
//debug=t 是老师的意思
// console.log(ordervlue)7009
// console.log(ordervlue)70094444444
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`;
@ -2641,7 +2644,8 @@ class Listofworksstudentone extends Component {
completion: student_works[i].complete_count === null ? "0" : student_works[i].complete_count === undefined ? "0" : student_works[i].complete_count,
levelscore: student_works[i].final_score,
efficiencyscore: student_works[i].eff_score === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score,
finalscore: student_works[i].work_score,
final_score: student_works[i].final_score===null||student_works[i].final_score===undefined||student_works[i].final_score===""?"--":student_works[i].final_score,
work_score:student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score,
view_answer_count: student_works[i].view_answer_count,
operating: "查看",
late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,

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

@ -232,9 +232,11 @@ class ShixunHomeworkPage extends Component {
typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/>
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
{teacherdatapage&&teacherdatapage.shixun_status>1?this.props.isAdmin()?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>:""}
target={"_blank"}>实训详情</a>: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>:"":"":""}
</div>
@ -336,7 +338,7 @@ class ShixunHomeworkPage extends Component {
<a className="fr color-blue font-16"
href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
}
{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1?<Startshixuntask
{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1&&teacherdatapage&&teacherdatapage.time_status<5?<Startshixuntask
{...this.props}
data={teacherdatapage}
/>:""}

3
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -371,6 +371,7 @@ class ShixunhomeWorkItem extends Component{
{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
discussMessage.time_status<5?
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt10">
{startbtn===false?
(discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
@ -381,7 +382,7 @@ class ShixunhomeWorkItem extends Component{
<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
{discussMessage.task_operation[0]}
</a>):<a className="btn colorblue" >开启中</a>}
</WordsBtn>:"":"":""
</WordsBtn>:"":"":"":""
}
</h6>

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

@ -1208,7 +1208,7 @@ class ShixunHomework extends Component{
{this.props.isAdmin()?<Menu.Item key="0">未发布</Menu.Item>:""}
<Menu.Item key="1">提交中</Menu.Item>
<Menu.Item key="2">补交中</Menu.Item>
<Menu.Item key="5">评阅中</Menu.Item>
<Menu.Item key="5">已截止</Menu.Item>
</Menu>
</div>
<div className="fr mt16 mb16 searchView">

22
public/react/src/modules/courses/statistics/Statistics.js
Unescape View File

@ -392,12 +392,13 @@ class Statistics extends Component{
)
}
// console.log(this.props.isAdmin)
// console.log("Statistics");
// console.log(this.props.user.course_is_end)
const operations = <React.Fragment>
const course_is_endismy=this.props&&this.props.user&&this.props.user.course_is_end;
const operations = <React.Fragment>
{course_grouptype===false||this.state.course_groups.length===0?"":
this.state.activeKey==="1"?
this.props.isAdmin()===true?
<Dropdownbox
{...this.props}
{...this.state}
@ -408,12 +409,17 @@ class Statistics extends Component{
}
{
this.state.activeKey==="1"?
<a className={"ml20 ant-btn-link"} onClick={()=>this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩</a>
(
course_is_endismy===false?
<a className={"ml20 ant-btn-link"} onClick={()=>this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩</a>
:
""
)
:""
}
{
this.state.activeKey==="1"?
<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
this.props.isAdmin()===true?
<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
:""
}
</React.Fragment>;
@ -592,7 +598,7 @@ class Statistics extends Component{
}
`
}</style>
<Tabs className="statisticsTabs" activeKey={this.state.activeKey} onChange={this.activeKey} tabBarExtraContent={this.props.isAdmin()===true?operations:""}>
<Tabs className="statisticsTabs" activeKey={this.state.activeKey} onChange={this.activeKey} tabBarExtraContent={operations}>
<TabPane tab="学习成绩" key="1" className={"statisticsTabs1"} >
{bomdata===undefined||bomdata===null?"":bomdata.length===0?<NoneData/>:<Table
columns={columns}

9
public/react/src/modules/tpm/component/TPMNav.js
Unescape View File

@ -53,13 +53,8 @@ class TPMNav extends Component {
{/*jupyter*/}
{
this.props.is_jupyter===true?
(
is_teacher===true?
<Link to={`/shixuns/${shixunId}/dataset`}
className={`${match.url.indexOf('dataset') != -1 ? 'active' : ''} fl mr40`}>数据集</Link>
:""
)
:""
}
@ -80,12 +75,8 @@ class TPMNav extends Component {
<Link to={`/shixuns/${shixunId}/audit_situation`}
className={`${match.url.indexOf('audit_situation') != -1 ? 'active' : ''} fl`}>审核情况</Link>
:
is_teacher===true?
<Link to={`/shixuns/${shixunId}/audit_situation`}
className={`${match.url.indexOf('audit_situation') != -1 ? 'active' : ''} fl`}>审核情况</Link>
:
""
)

1
public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
Unescape View File

@ -189,6 +189,7 @@ class Challengesjupyter extends Component {
const business = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false;
//管理员
const admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
let mysidentity =false;
try {
mysidentity =this.props.identity < 5 &&ChallengesDataList&& ChallengesDataList.shixun_status< 3?true:false;

Write Preview
Loading…
Cancel
Save