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

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

Browse Source
dev_hss
daiao 6 years ago
parent 4c6a2d596d 5dd8fcb0e2
commit 62301e2715
21 changed files with 235 additions and 159 deletions
Show Stats Download Patch File Download Diff File

2
app/models/user_extension.rb
Unescape View File

@ -1,6 +1,6 @@
class UserExtension < ApplicationRecord class UserExtension < ApplicationRecord
# identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者 # identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者
enum identity: { teacher: 0, student: 1, professional: 2, developer: 3 } enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, cnmooc: 4, unselect: -1 }
belongs_to :user, touch: true belongs_to :user, touch: true
belongs_to :school, optional: true belongs_to :school, optional: true

BIN
public/images/educoder/path.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 180 KiB

BIN
public/react/src/images/path/path.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 661 KiB

After

Width:  |  Height:  |  Size: 180 KiB

2
public/react/src/modules/courses/busyWork/common/TabRightComponents.js
Unescape View File

@ -63,7 +63,7 @@ class TabRightComponents extends Component{
}) })
} }
}else { }else {
this.props.slowDownload(url) this.props.slowDownload(url);
// this.props.showNotification(`正在下载中`); // this.props.showNotification(`正在下载中`);
// window.open("/api"+url, '_blank'); // window.open("/api"+url, '_blank');
} }

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

@ -87,7 +87,7 @@ class Completetaskpage extends Component {
this.setState({ this.setState({
banksMenu:menuData banksMenu:menuData
}) })
this.props.initPublic(crumbData); this.props.initPublic(crumbData,response.data);
}catch (e) { }catch (e) {
} }

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

@ -82,7 +82,7 @@ class CompletetopicdePage extends Component {
this.setState({ this.setState({
banksMenu:menuData banksMenu:menuData
}) })
this.props.initPublic(crumbData); this.props.initPublic(crumbData,response.data);
}catch (e) { }catch (e) {
} }

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

@ -92,7 +92,7 @@ class GroupjobbankPage extends Component {
this.setState({ this.setState({
banksMenu:menuData banksMenu:menuData
}) })
this.props.initPublic(crumbData); this.props.initPublic(crumbData,response.data);
}catch (e) { }catch (e) {
} }

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

@ -302,7 +302,7 @@ class PollNewQuestbank extends Component {
{content:'编辑'} {content:'编辑'}
] ]
} }
this.props.initPublic(crumbData); this.props.initPublic(crumbData,result.data);
}catch (e) { }catch (e) {
} }

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

@ -93,7 +93,7 @@ class Generaljobbankdetails extends Component {
this.setState({ this.setState({
banksMenu:menuData banksMenu:menuData
}) })
this.props.initPublic(crumbData); this.props.initPublic(crumbData,response.data);
}catch (e) { }catch (e) {
} }

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

@ -67,7 +67,7 @@ class Listofworksstudentone extends Component {
pages: 1, pages: 1,
limit: 20, limit: 20,
loadingstate: true, loadingstate: true,
order: "update_time", order: "",
search: null, search: null,
day: 0, day: 0,
hour: 0, hour: 0,
@ -130,30 +130,30 @@ class Listofworksstudentone extends Component {
<span className="maxnamewidth100"> <span className="maxnamewidth100">
{record.name === undefined ? {record.name === undefined ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>--</span> }}>--</span>
: :
record.name === "" ? record.name === "" ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>--</span> }}>--</span>
: :
record.name === null ? record.name === null ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>--</span> }}>--</span>
: :
record.name === "--" ? record.name === "--" ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>--</span> }}>--</span>
: :
<a className="maxnamewidth100" title={record.name} style={{ <a className="maxnamewidth100" title={record.name} style={{
color: '#07111B', "color": '#07111B',
textAlign: "center" textAlign: "center"
}}>{record.name}</a> }}>{record.name}</a>
} }
@ -167,24 +167,23 @@ class Listofworksstudentone extends Component {
key: 'stduynumber', key: 'stduynumber',
align: "center", align: "center",
className:'font-14 maxnamewidth110', className:'font-14 maxnamewidth110',
width:'110px',
render: (text, record) => ( render: (text, record) => (
<span className="maxnamewidth110"> <span className="maxnamewidth110">
{record.stduynumber === undefined ? {record.stduynumber === undefined ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>-- }}>--
</span> </span>
: record.stduynumber === null ? : record.stduynumber === null ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>-- }}>--
</span> </span>
: record.stduynumber === "" ? : record.stduynumber === "" ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>-- }}>--
</span> </span>
@ -193,7 +192,7 @@ class Listofworksstudentone extends Component {
title={record.stduynumber} title={record.stduynumber}
className="maxnamewidth110" className="maxnamewidth110"
style={{ style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>{ }}>{
record.stduynumber record.stduynumber
@ -214,7 +213,7 @@ class Listofworksstudentone extends Component {
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span className="ysltable" style={{ <span className="ysltable" style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span> }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
</span> </span>
@ -229,10 +228,10 @@ class Listofworksstudentone extends Component {
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={record.submitstate === "延时提交" ? { <span style={record.submitstate === "延时提交" ? {
color: '#DD1717', "color": '#DD1717',
textAlign: "center" textAlign: "center"
} : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center"} : { } : record.submitstate === "按时提交" ? {"color": '#29BD8B', textAlign: "center"} : {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" textAlign: "center"
}}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span> }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
@ -251,26 +250,37 @@ class Listofworksstudentone extends Component {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center"
} }
}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } }>
</span> {record.cost_time === null? "--":record.cost_time === undefined?"--":
) <a style={
},
{ {
title: '更新时间', color: '#747A7F',
dataIndex: 'updatetime',
key: 'updatetime',
align: "center",
className:'font-14',
render: (text, record) => (
<span>
<span style={{
color: '#9A9A9A',
textAlign: "center" textAlign: "center"
}}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span> }
}
title={"学员在EduCoder做实训花费的时间"}
>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
</a>
}
</span> </span>
), )
}, },
// {
// title: '更新时间',
// dataIndex: 'updatetime',
// key: 'updatetime',
// align: "center",
// className:'font-14',
// render: (text, record) => (
// <span>
// <span style={{
// "color": '#9A9A9A',
// "text-align": "center"
// }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
// </span>
// ),
// },
{ {
title: '完成情况', title: '完成情况',
dataIndex: 'completion', dataIndex: 'completion',
@ -279,7 +289,7 @@ class Listofworksstudentone extends Component {
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={{color: '#07111B', textAlign: "center"}}>{record.completion+"/"+this.state.challenges_count}</span> <span style={{color: '#07111B',textAlign: "center"}}>{record.completion+"/"+this.state.challenges_count}</span>
</span> </span>
), ),
}, },
@ -379,7 +389,7 @@ class Listofworksstudentone extends Component {
}, },
], ],
orders: "update_time", orders: "",
b_order:"desc", b_order:"desc",
allow_late:false, allow_late:false,
checkedValuesine: undefined, checkedValuesine: undefined,
@ -395,8 +405,8 @@ class Listofworksstudentone extends Component {
course_group: null, course_group: null,
publish_immediately: undefined, publish_immediately: undefined,
end_immediately: undefined, end_immediately: undefined,
mystyle: {"display": "block", color: '#07111B', textAlign: "center"}, mystyle: {"display": "block", "color": '#07111B', textAlign: "center"},
mystyles: {"display": "none", color: '#07111B', textAlign: "center"}, mystyles: {"display": "none", "color": '#07111B', textAlign: "center"},
mystyle1: {"display": "block"}, mystyle1: {"display": "block"},
mystyles1: {"display": "none"}, mystyles1: {"display": "none"},
unlimited: 0, unlimited: 0,
@ -413,7 +423,7 @@ class Listofworksstudentone extends Component {
align: 'center', align: 'center',
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span style={{color: '#07111B', textAlign: "center"}}>{record.number} <span style={{"color": '#07111B', textAlign: "center"}}>{record.number}
</span> </span>
) )
}, },
@ -425,7 +435,7 @@ class Listofworksstudentone extends Component {
className:'font-14 maxnamewidth100', className:'font-14 maxnamewidth100',
width:'100px', width:'100px',
render: (text, record) => ( render: (text, record) => (
<a className="maxnamewidth100" title={record.name} style={{color: '#07111B', textAlign: "center"}}>{record.name}</a> <a className="maxnamewidth100" title={record.name} style={{"color": '#07111B', textAlign: "center"}}>{record.name}</a>
) )
}, },
{ {
@ -434,7 +444,6 @@ class Listofworksstudentone extends Component {
key: 'stduynumber', key: 'stduynumber',
align: "center", align: "center",
className:'font-14 maxnamewidth110', className:'font-14 maxnamewidth110',
width:'110px',
render: (text, record) => ( render: (text, record) => (
<span className="maxnamewidth110"> <span className="maxnamewidth110">
{record.stduynumber === undefined ? {record.stduynumber === undefined ?
@ -480,7 +489,7 @@ class Listofworksstudentone extends Component {
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span> <span>
{record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>} {record.classroom === undefined ?<span className="ysltable" style={{"color": '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{"color": '#07111B',textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{"color": '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{"color": '#07111B',textAlign: "center"}}>{record.classroom}</span>}
</span> </span>
) )
}, },
@ -514,21 +523,41 @@ class Listofworksstudentone extends Component {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center"
} }
}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } }>
{record.cost_time === null? "--":record.cost_time === undefined?"--":
<a style={
{
color: '#747A7F',
textAlign: "center"
}
}
title={"学员在EduCoder做实训花费的时间"}
>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
</a>
}
</span> </span>
// <a style={
// {
// "color": '#747A7F',
// "text-align": "center"
// }
// }
// title={record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
// >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
// </a>
) )
}, },
{ // {
title: '更新时间', // title: '更新时间',
dataIndex: 'updatetime', // dataIndex: 'updatetime',
key: 'updatetime', // key: 'updatetime',
align: 'center', // align: 'center',
className:'font-14', // className:'font-14',
render: (text, record) => ( // render: (text, record) => (
<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span> // <span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
), // ),
}, // },
{ {
title: '完成情况', title: '完成情况',
dataIndex: 'completion', dataIndex: 'completion',
@ -541,7 +570,7 @@ class Listofworksstudentone extends Component {
<Tooltip placement="bottom" title={<div> <Tooltip placement="bottom" title={<div>
<div>已通过{record.completion}关，共{this.state.challenges_count}关</div> <div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
</div>}> </div>}>
<span style={{color: '#07111B', textAlign: "center"}}>{record.completion+"/"+this.state.challenges_count} </span> <span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
</Tooltip> </Tooltip>
</span> </span>
@ -556,14 +585,14 @@ class Listofworksstudentone extends Component {
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={parseInt(record.levelscore) <= 60 ? { <span style={parseInt(record.levelscore) <= 60 ? {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
} : parseInt(record.levelscore) < 90 ? { } : parseInt(record.levelscore) < 90 ? {
color: '#FF6800', "color": '#FF6800',
textAlign: "center" "text-align": "center"
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : { } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
}}>{record.levelscore}</span> }}>{record.levelscore}</span>
</span> </span>
) )
@ -602,15 +631,15 @@ class Listofworksstudentone extends Component {
) )
: :
<span style={parseInt(record.efficiencyscore) <= 60 ? { <span style={parseInt(record.efficiencyscore) <= 60 ? {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
} : parseInt(record.efficiencyscore) < 90 ? { } : parseInt(record.efficiencyscore) < 90 ? {
color: '#FF6800', "color": '#FF6800',
textAlign: "center" "text-align": "center"
} : parseInt(record.efficiencyscore) >= 90 ? { } : parseInt(record.efficiencyscore) >= 90 ? {
color: '#DD1717', "color": '#DD1717',
textAlign: "center" "text-align": "center"
} : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore}</span> } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
} }
</span> </span>
@ -634,19 +663,19 @@ class Listofworksstudentone extends Component {
record.finalscore&&record.finalscore==="--"? record.finalscore&&record.finalscore==="--"?
<span style= <span style=
{{ {{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
: :
<span style={parseInt(record.finalscore) <= 60 ? { <span style={parseInt(record.finalscore) <= 60 ? {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
} : parseInt(record.finalscore) < 90 ? { } : parseInt(record.finalscore) < 90 ? {
color: '#FF6800', "color": '#FF6800',
textAlign: "center" "text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : { } : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
} }
</Tooltip> </Tooltip>
@ -662,19 +691,19 @@ class Listofworksstudentone extends Component {
record.finalscore&&record.finalscore==="--"? record.finalscore&&record.finalscore==="--"?
<span style= <span style=
{{ {{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
: :
<span style={parseInt(record.finalscore) <= 60 ? { <span style={parseInt(record.finalscore) <= 60 ? {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
} : parseInt(record.finalscore) < 90 ? { } : parseInt(record.finalscore) < 90 ? {
color: '#FF6800', "color": '#FF6800',
textAlign: "center" "text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : { } : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
color: '#747A7F', "color": '#747A7F',
textAlign: "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
} }
</Tooltip> </Tooltip>
@ -707,7 +736,7 @@ class Listofworksstudentone extends Component {
align: 'center', align: 'center',
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span style={{color: '#07111B', textAlign: "center"}}>{record.number} <span style={{"color": '#07111B', "text-align": "center"}}>{record.number}
</span> </span>
) )
}, },
@ -719,7 +748,7 @@ class Listofworksstudentone extends Component {
className:'font-14 maxnamewidth100', className:'font-14 maxnamewidth100',
width:'100px', width:'100px',
render: (text, record) => ( render: (text, record) => (
<a className="maxnamewidth100" title={record.name} style={{color: '#07111B', textAlign: "center"}}>{record.name}</a> <a className="maxnamewidth100" title={record.name} style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
) )
}, },
{ {
@ -728,25 +757,24 @@ class Listofworksstudentone extends Component {
key: 'stduynumber', key: 'stduynumber',
align: "center", align: "center",
className:'font-14 maxnamewidth110', className:'font-14 maxnamewidth110',
width:'110px',
render: (text, record) => ( render: (text, record) => (
<span className="maxnamewidth110"> <span className="maxnamewidth110">
{record.stduynumber === undefined ? {record.stduynumber === undefined ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" "text-align": "center"
}}>-- }}>--
</span> </span>
: record.stduynumber === null ? : record.stduynumber === null ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" "text-align": "center"
}}>-- }}>--
</span> </span>
: record.stduynumber === "" ? : record.stduynumber === "" ?
<span style={{ <span style={{
color: '#9A9A9A', "color": '#9A9A9A',
textAlign: "center" "text-align": "center"
}}>-- }}>--
</span> </span>
: :
@ -774,7 +802,7 @@ class Listofworksstudentone extends Component {
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span> <span>
{record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>} {record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B',textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>}
</span> </span>
) )
}, },
@ -796,16 +824,16 @@ class Listofworksstudentone extends Component {
) )
}, },
{ // {
title: '更新时间', // title: '更新时间',
dataIndex: 'updatetime', // dataIndex: 'updatetime',
key: 'updatetime', // key: 'updatetime',
align: 'center', // align: 'center',
className:'font-14', // className:'font-14',
render: (text, record) => ( // render: (text, record) => (
<span style={{color: '#9A9A9A',textAlign: "center"}}>{record.updatetime}</span> // <span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
), // ),
}, // },
{ {
title: '实战耗时', title: '实战耗时',
dataIndex: 'cost_time', dataIndex: 'cost_time',
@ -818,10 +846,20 @@ class Listofworksstudentone extends Component {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center"
} }
}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } }>
{record.cost_time === null ? "--":record.cost_time === undefined ?"--":
<a style={
{
color: '#747A7F',
textAlign: "center"
}
}
title={"学员在EduCoder做实训花费的时间"}
>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
</a>
}
</span> </span>
) )
}, },
{ {
title: '完成情况', title: '完成情况',
@ -904,7 +942,7 @@ class Listofworksstudentone extends Component {
} : parseInt(record.efficiencyscore) >= 90 ? { } : parseInt(record.efficiencyscore) >= 90 ? {
color: '#DD1717', color: '#DD1717',
textAlign: "center" textAlign: "center"
} : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore}</span> } : {color: '#747A7F',textAlign: "center"}}>{record.efficiencyscore}</span>
} }
</span> </span>
@ -1031,8 +1069,6 @@ class Listofworksstudentone extends Component {
// console.log(this.props); // console.log(this.props);
// console.log(this.props.isAdmin()) // console.log(this.props.isAdmin())
this.student(); this.student();
console.log("Listofworksstudentone---------------");
console.log(this.props);
} }
isupdatas = () => { isupdatas = () => {
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;
@ -1658,9 +1694,9 @@ class Listofworksstudentone extends Component {
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`; let urll = `/homework_commons/${homeworkid}/works_list.json?`;
var order = "asc"; var order = "asc";
if (ordervlue === "update_time") { // if (ordervlue === "update_time") {
order = "desc"; // order = "desc";
} // }
var checkedValuesines = checkedValuesine; var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo; var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext var searchtexts = searchtext
@ -2067,15 +2103,15 @@ class Listofworksstudentone extends Component {
} }
//排序 //排序
funordert = (e) => { funordert = (e) => {
if (e === "update_time") { // if (e === "update_time") {
// 时间 // // 时间
// 时间排序是从小到大 // // 时间排序是从小到大
this.setState({ // this.setState({
orders: "update_time", // orders: "update_time",
loadingstate: true, // loadingstate: true,
}) // })
this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); // this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
} // }
if (e === "work_score") { if (e === "work_score") {
// 成绩 // 成绩
@ -2475,8 +2511,9 @@ class Listofworksstudentone extends Component {
}) })
} }
}else { }else {
this.props.showNotification(`正在下载中`); // this.props.showNotification(`正在下载中`);
window.open("/api"+url, '_blank'); // window.open("/api"+url, '_blank');
this.props.slowDownload(url);
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -2494,12 +2531,27 @@ class Listofworksstudentone extends Component {
let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />; const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
// console.log(this.state.student_works);
// console.log("841");
// console.log(this.state.columns);
// console.log(datajs);
// console.log("2202");
// console.log(this.props.isAdmin());
// console.log("2498");
// console.log(data);
// console.log(datas);
// console.log(this.props.isAdmin());
let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
// if(this.props.isAdmin() === false){
console.log("Listofworksstudentone+++++++++"); // if(teacherdata.student_works!==undefined){
console.log(this.props); // if(teacherdata.student_works.length>0){
//
//
// }
// }
//
// }
return ( return (
this.props.isAdmin() === true ? this.props.isAdmin() === true ?
( (
@ -2749,10 +2801,10 @@ class Listofworksstudentone extends Component {
<ul> <ul>
<li className="edu-position edu-position-hidebox"> <li className="edu-position edu-position-hidebox">
<a className="font-12"> <a className="font-12">
{orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a> {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 "></i> <i className="iconfont icon-xiajiantou ml5 font-12 "></i>
<ul className="edu-position-hide undis mt10"> <ul className="edu-position-hide undis mt10">
<li> <a onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li> {/*<li> <a onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>*/}
<li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩</a></li> <li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩</a></li>
<li> <a onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li> <li> <a onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
</ul> </ul>
@ -3204,11 +3256,11 @@ class Listofworksstudentone extends Component {
{/*<i className="iconfont icon-xiajiantou ml5 font-12 "></i>*/} {/*<i className="iconfont icon-xiajiantou ml5 font-12 "></i>*/}
{/*<ul className="edu-position-hide undis mt10">*/} {/*<ul className="edu-position-hide undis mt10">*/}
{/*<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"*/} {/*<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"*/}
{/*className="color-grey-6 font-12" style={{textAlign: "center "}}>更新时间</a></li>*/} {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>*/}
{/*<li><a onClick={(e) => this.funorder("work_score")} data-remote="true"*/} {/*<li><a onClick={(e) => this.funorder("work_score")} data-remote="true"*/}
{/*className="color-grey-6 font-12" style={{textAlign: "center "}}>最终成绩</a></li>*/} {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>*/}
{/*<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"*/} {/*<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"*/}
{/*className="color-grey-6 font-12" style={{textAlign: "center "}}>学生学号</a></li>*/} {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>*/}
{/*</ul>*/} {/*</ul>*/}
{/*</li>*/} {/*</li>*/}
{/*</ul>*/} {/*</ul>*/}

4
public/react/src/modules/courses/shixunHomework/style.css
Unescape View File

@ -38,14 +38,14 @@
.TopicDetailTable .bottomBody li:last-child{border-bottom: none;} .TopicDetailTable .bottomBody li:last-child{border-bottom: none;}
.maxnamewidth100{ .maxnamewidth100{
max-width: 100px; max-width: 145px;
overflow:hidden; overflow:hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap; white-space:nowrap;
cursor: default; cursor: default;
} }
.maxnamewidth110{ .maxnamewidth110{
max-width: 110px; max-width: 145px;
overflow:hidden; overflow:hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap; white-space:nowrap;

3
public/react/src/modules/page/MainContent.js
Unescape View File

@ -100,6 +100,9 @@ class MainContent extends Component {
vnc_url={vnc_url} vnc_url={vnc_url}
{...this.props} {...this.props}
></VNCContainer> ></VNCContainer>
<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack" style={{height:'48px'}}>
<ActionView onRunCodeTest={onRunCodeTest} {...this.props}></ActionView>
</div>
</CodeRepositoryViewContainer> </CodeRepositoryViewContainer>
: :
<React.Fragment> <React.Fragment>

21
public/react/src/modules/tpm/TPMsettings/TPMsettings.js
Unescape View File

@ -355,6 +355,7 @@ export default class TPMsettings extends Component {
code_hidden: response.data.shixun.code_hidden, code_hidden: response.data.shixun.code_hidden,
forbid_copy: response.data.shixun.forbid_copy, forbid_copy: response.data.shixun.forbid_copy,
vnc: response.data.shixun.vnc, vnc: response.data.shixun.vnc,
vnc_evaluate: response.data.shixun.vnc_evaluate,
name: response.data.shixun.name, name: response.data.shixun.name,
scope_partment: response.data.shixun.scope_partment, scope_partment: response.data.shixun.scope_partment,
description: response.data.shixun.description, description: response.data.shixun.description,
@ -535,6 +536,12 @@ export default class TPMsettings extends Component {
forbid_copy: sum, forbid_copy: sum,
}); });
} }
shixun_vnc_evaluate=(e) => {
this.setState({
vnc_evaluate: e.target.checked,
});
}
shixun_vnc=(e)=>{ shixun_vnc=(e)=>{
// let sum = "" // let sum = ""
@ -545,6 +552,7 @@ export default class TPMsettings extends Component {
// } // }
this.setState({ this.setState({
vnc: e.target.checked, vnc: e.target.checked,
vnc_evaluate: false,
}); });
} }
@ -772,7 +780,7 @@ export default class TPMsettings extends Component {
} }
let { let {
name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, vnc_evaluate,
evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh, evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
opening_time,shixunmemoMDvalue,shixun_service_configlist opening_time,shixunmemoMDvalue,shixun_service_configlist
} = this.state; } = this.state;
@ -883,6 +891,7 @@ export default class TPMsettings extends Component {
use_scope: use_scope, use_scope: use_scope,
can_copy: can_copy, can_copy: can_copy,
vnc: vnc===null?undefined:vnc, vnc: vnc===null?undefined:vnc,
vnc_evaluate: vnc_evaluate===null?undefined:vnc_evaluate,
test_set_permission: test_set_permission, test_set_permission: test_set_permission,
code_hidden: code_hidden, code_hidden: code_hidden,
trainee: trainee, trainee: trainee,
@ -1464,6 +1473,7 @@ export default class TPMsettings extends Component {
forbid_copy, forbid_copy,
code_hidden, code_hidden,
vnc, vnc,
vnc_evaluate,
scopetype, scopetype,
scope_partment, scope_partment,
departmentslist, departmentslist,
@ -2227,6 +2237,15 @@ export default class TPMsettings extends Component {
<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label> <label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
</span> </span>
</div>:""} </div>:""}
{this.props.identity<3 && vnc ?<div className="clearfix mt20 ml30">
<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化评测:</span>
<span className="fl mt5 ml5">
<Checkbox checked={vnc_evaluate === undefined ? false : vnc_evaluate} onChange={this.shixun_vnc_evaluate}></Checkbox>
<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则在VNC图形化实训中，给学员开启评测</label>
</span>
</div>:""}
</div> </div>

5
public/react/src/modules/user/usersInfo/banks/BanksIndex.js
Unescape View File

@ -85,7 +85,10 @@ class BanksIndex extends Component{
} }
initPublic = (crumbData) =>{ initPublic = (crumbData,data) =>{
if(data && data.status && data.status == -2){
this.props.history.push(`/topicbank/publicly`);
}
this.setState({ this.setState({
crumbData crumbData
}) })

4
public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js
Unescape View File

@ -31,11 +31,11 @@ class BanksTabIndex extends Component{
} }
} }
initPublic = (crumbData,menuData) =>{ initPublic = (crumbData,menuData,data) =>{
this.setState({ this.setState({
banksMenu:menuData banksMenu:menuData
}) })
this.props.initPublic(crumbData); this.props.initPublic(crumbData,data);
} }
render(){ render(){

2
public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
Unescape View File

@ -36,7 +36,7 @@ class ExerciseBanksDetail extends Component{
type:this.props.match.params.type, type:this.props.match.params.type,
authorize:result && result.data && result.data.authorize, authorize:result && result.data && result.data.authorize,
} }
this.props.initPublic(crumbData,menuData); this.props.initPublic(crumbData,menuData,result.data);
} }
render(){ render(){

2
public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js
Unescape View File

@ -29,7 +29,7 @@ class ExerciseBanksEdit extends Component {
{content:'编辑'} {content:'编辑'}
] ]
} }
this.props.initPublic(crumbData); this.props.initPublic(crumbData,responseData.data);
} }
render(){ render(){

2
public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
Unescape View File

@ -29,7 +29,7 @@ class GtaskBanksEdit extends Component {
{content:'编辑'} {content:'编辑'}
] ]
} }
this.props.initPublic(crumbData); this.props.initPublic(crumbData,result.data);
result.data.isEdit = true; result.data.isEdit = true;
this.setState({ data:result.data}) this.setState({ data:result.data})
this.newWorkFormRef.initValue(result.data); this.newWorkFormRef.initValue(result.data);

3
public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
Unescape View File

@ -12,7 +12,6 @@ class GtopicBanksEdit extends Component{
} }
componentDidMount = () =>{ componentDidMount = () =>{
let bankId = this.props.match.params.bankId; let bankId = this.props.match.params.bankId;
this.initData(bankId); this.initData(bankId);
} }
@ -28,7 +27,7 @@ class GtopicBanksEdit extends Component{
{content:'编辑'} {content:'编辑'}
] ]
} }
this.props.initPublic(crumbData); this.props.initPublic(crumbData,result.data);
this.GraduateTopicNewFromRef.initValue(result); this.GraduateTopicNewFromRef.initValue(result);
} }

2
public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
Unescape View File

@ -30,7 +30,7 @@ class HomeworkBanksEdit extends Component {
{content:'编辑'} {content:'编辑'}
] ]
} }
this.props.initPublic(crumbData); this.props.initPublic(crumbData,result.data);
result.data.isEdit = true; result.data.isEdit = true;
result.data.ref_attachments = result.data.reference_attachments result.data.ref_attachments = result.data.reference_attachments
// this.setState({ isGroup: result.data.min_num || result.data.max_num }) // this.setState({ isGroup: result.data.min_num || result.data.max_num })

2
public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
Unescape View File

@ -47,7 +47,7 @@ class PollBanksContent extends Component{
type:this.props.match.params.type, type:this.props.match.params.type,
authorize:result && result.data && result.data.authorize, authorize:result && result.data && result.data.authorize,
} }
this.props.initPublic(crumbData,menuData); this.props.initPublic(crumbData,menuData,result.data);
this.setState({ this.setState({
pollDetail pollDetail
}) })

Write Preview
Loading…
Cancel
Save