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_cs_new
daiao 6 years ago
parent 26c3da2902 284493c02f
commit adc16951b7
8 changed files with 214 additions and 63 deletions
Show Stats Download Patch File Download Diff File

5
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -152,7 +152,7 @@ function buildColumns(that, student_works) {
<span>
{project_info && project_info.name && <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`}
target={ project_info.id == -1 ? '' : "_blank" }
className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto', display: 'block'}} title={project_info.name}
className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name}
>{project_info.name}</a>}
</span>
),
@ -749,6 +749,9 @@ class CommonWorkList extends Component{
border-bottom: none;
}
.studentTable .ant-table-tbody { background: '#F1F9FF' }
.studentTable table, .stageTable table{
font-size: 13px !important;
}
`}</style>
{ isStudent &&StudentData===undefined?"":StudentData===undefined?"":
<Table

8
public/react/src/modules/courses/coursesPublic/PathModal.js
Unescape View File

@ -288,17 +288,19 @@ class PathModal extends Component{
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
<li className="fl with40 newtaskhide">
<Checkbox
id={"shixun_input_"+item.subject_id} value={item.subject_id}
id={"shixun_input_"+item.subject_id}
value={item.subject_id}
key={item.subject_id}
className="task-hide edu-txt-left newtaskhide"
style={{"width":"280px"}}
name="shixun_homework[]"
>
<label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.subject_name}</label>
<label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.subject_name}>{item.subject_name}</label>
</Checkbox>
</li>
<li className="fl with30 edu-txt-left task-hide pl40">{item.shixun_count}</li>
<li className="fl with10 paddingl10">{item.myshixun_count}</li>
<Tooltip title="查看详情">
<Tooltip title="新窗口查看详情">
<li className="fr with10"><a className="color-blue" href={"/paths/"+item.subject_id} target="_blank">详情</a></li>
</Tooltip>
</div>

3
public/react/src/modules/courses/members/modal/AddTeacherModal.js
Unescape View File

@ -283,11 +283,12 @@ class AddTeacherModal extends Component{
<p className="clearfix mb7" key={candidate.id}>
<Checkbox className="fl" value={candidate.id} ></Checkbox>
<span className="fl with25">
{/* "color":"#4c4c4c" */}
<ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
<label className="task-hide fl" style={{"maxWidth":"208px;"}}
>
<a href={`/users/${candidate.login}`} target="_blank"
style={{"color":"#4c4c4c"}}
style={{}}
>{candidate.name}</a>
</label>
</ConditionToolTip>

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

@ -1194,6 +1194,8 @@ class Listofworksstudentone extends Component {
}
seacthdatas = (teacherdata,student_works) => {
console.log("1197");
console.log(this.props.isNotMember());
let {page, limit,work_efficiency} = this.state;
let datalist = [];
let datalists = [];
@ -1201,17 +1203,38 @@ class Listofworksstudentone extends Component {
var arr =[];
for(var i=0;i<this.state.columnsstu.length;i++){
var item = this.state.columnsstu[i];
if (work_efficiency === false) {
if(item.title==="关卡得分"){
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
else if(item.title==="效率分"){
if(item.title==="学号") {
continue
}
else{
arr.push(item);
}
}
else{
if (work_efficiency === false) {
if(item.title==="关卡得分"){
continue
}
else if(item.title==="效率分"){
continue
if(this.props.isNotMember()===true&&item.title==="学号") {
}else{
arr.push(item);
}
}else{
arr.push(item);
}
}else{
arr.push(item);
}
}
let columns2= arr;
@ -1300,8 +1323,7 @@ class Listofworksstudentone extends Component {
}
// console.log("554");
// console.log(columns2);
// console.log(arr);
this.setState({
data: datalist,
datas: datalists,
@ -1313,23 +1335,44 @@ class Listofworksstudentone extends Component {
}
// 设置数据
seacthdata = (teacherdata) => {
console.log("1326");
console.log(this.props.isNotMember());
let datalist = [];
var arr =[];
for(var i=0;i<this.state.columnsstu.length;i++){
var item = this.state.columnsstu[i];
if (this.state.work_efficiency === false) {
if (item.title === "关卡得分") {
} else if (item.title === "效率分") {
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
if(item.title==="学号") {
continue
}else{
arr.push(item);
}
}else{
if (this.state.work_efficiency === false) {
if (item.title === "关卡得分") {
continue
} else if (item.title === "效率分") {
continue
}else{
arr.push(item);
}
}else{
arr.push(item);
}
}
if(this.props.isNotMember()===true&&item.title==="学号") {
}else{
arr.push(item);
}
}
let columns2= arr;
@ -1715,66 +1758,144 @@ class Listofworksstudentone extends Component {
if (work_efficiency === false) {
if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){
//这里没有分班 没有 关卡得分 没有效率分
console.log("1739");
console.log(this.props.isNotMember());
for(var i=0;i< this.state.columns.length;i++){
var item = this.state.columns[i];
if(item.title==="分班"){
}
else if(item.title==="关卡得分"){
}
else if(item.title==="效率分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
if(item.title==="学号") {
continue
}else{
columns2js.push(item);
}
}else{
columns2js.push(item);
if(item.title==="分班"){
continue
}
if(item.title==="关卡得分"){
continue
}
if(item.title==="效率分"){
continue
}else {
columns2js.push(item);
}
}
}
}else{
console.log("1767");
console.log(this.props.isNotMember());
if(course_group_info.length < 2){
for(var i=0;i< this.state.columns.length;i++){
var item = this.state.columns[i];
if(item.title==="分班"){
}
else if(item.title==="关卡得分"){
}
else if(item.title==="效率分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
if(item.title==="学号") {
continue
}else{
columns2js.push(item);
}
}else{
columns2js.push(item);
if(item.title==="分班"){
continue
}
if(item.title==="关卡得分"){
continue
}
if(item.title==="效率分"){
continue
}
else {
columns2js.push(item);
}
}
}
}else {
console.log("1795");
console.log(this.props.isNotMember());
for(var i=0;i< this.state.columns.length;i++){
var item = this.state.columns[i];
if(item.title==="关卡得分"){
}
else if(item.title==="效率分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
if(item.title==="学号") {
continue
}else{
columns2js.push(item);
}
}else{
if(item.title==="关卡得分"){
continue
}
if(item.title==="效率分"){
continue
}else {
columns2js.push(item);
}
}
}
}
}
}else {
console.log("1821");
console.log(this.props.isNotMember());
if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined || course_group_info === null){
for(var i=0;i< this.state.columns.length;i++){
var item = this.state.columns[i];
if(item.title==="分班"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
if(item.title==="学号") {
continue
}else{
columns2js.push(item);
}
}else{
columns2js.push(item);
if(item.title==="分班"){
continue
}else{
columns2js.push(item);
}
}
}
@ -1782,15 +1903,34 @@ class Listofworksstudentone extends Component {
}else {
console.log("1849");
console.log(this.props.isNotMember());
if(course_group_info.length < 2) {
for(var i=0;i< this.state.columns.length;i++){
var item = this.state.columns[i];
if(item.title==="分班"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
if(this.props.isNotMember()===true){
if(item.title==="关卡得分") {
continue
}
if(item.title==="效率分") {
continue
}
if(item.title==="最终成绩") {
continue
}
if(item.title==="学号") {
continue
}else{
columns2js.push(item);
}
}else{
columns2js.push(item);
if(item.title==="分班"){
continue
}else{
columns2js.push(item);
}
}
}
}
@ -1803,6 +1943,7 @@ class Listofworksstudentone extends Component {
//
// console.log(datalist);
// console.log("1712");
this.setState({
datajs: datalistjs,
columns: columns2js,
@ -2628,7 +2769,7 @@ class Listofworksstudentone extends Component {
</div>
:
<div className={"justify break_full_word new_li edu-back-white"} style={{minHeight: "480px"}}>
<div className={"justify break_full_word new_li "} style={{minHeight: "480px"}}>
<style>{`
.ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
top: 72%;}
@ -2647,7 +2788,7 @@ class Listofworksstudentone extends Component {
padding: 9px;
}
`}</style>
<div className="edu-table edu-back-white ant-tables ysltableo">
<div className="edu-table edu-back-white ant-tables ysltableo table1">
{datajs === undefined ? "" : <Table
dataSource={datajs}
columns={columns}
@ -2822,7 +2963,7 @@ class Listofworksstudentone extends Component {
</div>
</div>
<div className={"justify break_full_word new_li edu-back-white"}
<div className={"justify break_full_word new_li"}
style={{minHeight: "480px"}}>
<style>{`
.ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
@ -2838,7 +2979,7 @@ class Listofworksstudentone extends Component {
padding: 9px;
}
`}</style>
<div className="edu-table edu-back-white ysltableow">
<div className="edu-table edu-back-white ysltableow table2">
{data === undefined ? "" : <Table
dataSource={data}
columns={columnsstu}
@ -2925,7 +3066,7 @@ class Listofworksstudentone extends Component {
`
}
</style>
<div className="edu-table edu-back-white ysltableows">
<div className="edu-table edu-back-white ysltableows table3">
{data === undefined ? "" : <Table
style={styletable}
dataSource={data}
@ -3034,7 +3175,7 @@ class Listofworksstudentone extends Component {
</div>
<div className={"justify break_full_word new_li edu-back-white"}
<div className={"justify break_full_word new_li"}
style={{minHeight: "480px"}}>
<style>{`
.ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
@ -3050,7 +3191,7 @@ class Listofworksstudentone extends Component {
padding: 9px;
}
`}</style>
<div className="edu-table edu-back-white ysltableowss">
<div className="edu-table edu-back-white ysltableowss table4">
{datas === undefined ? "" : <Table
dataSource={datas}
columns={columnsstu}

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

@ -132,7 +132,7 @@ class ShixunHomeworkPage extends Component {
<div className="newMain clearfix ">
<div className={"educontent mb20"} style={{width: "1200px"}}>
<div className={"educontent mt20 mb20"} style={{width: "1200px"}}>
<div className="educontent mb20">
<p className="clearfix mb20 mt10">

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

@ -308,7 +308,7 @@ class ShixunWorkModal extends Component{
}
<div className={"clearfix"}>
<Checkbox checked={onChangetype} onChange={this.onChange} className={"ml10"}>{onChangetype===true?"清除":"全选"}</Checkbox>
<span>有效作品都为0</span>
{/*<span>有效作品都为0</span>*/}
</div>
<div className="clearfix mt30 edu-txt-center mb10">

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

@ -41,11 +41,13 @@
max-width: 100px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
white-space:nowrap;
cursor: default;
}
.maxnamewidth110{
max-width: 110px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
white-space:nowrap;
cursor: default;
}

8
public/react/src/modules/tpm/challengesnew/TPMevaluation.js
Unescape View File

@ -216,7 +216,8 @@ export default class TPMevaluation extends Component {
position: response.data.position, //int 关卡位置，导航栏中的第几关
scorevalue:response.data.test_set_score,
markvalue:response.data.test_set_average,
web_route:response.data.web_route
web_route:response.data.web_route,
has_web_route:response.data.has_web_route
})
this.evaluationoninputvalueonload();
if(response.data.power===false){
@ -780,7 +781,8 @@ export default class TPMevaluation extends Component {
web_route,
scorevalue,
markvalue,
scoretype
scoretype,
has_web_route
} = this.state;
let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint";
@ -987,7 +989,7 @@ export default class TPMevaluation extends Component {
</div>
</div>
{pathoptionvalue===4&&web_route!=null?<div className="edu-back-white mb10 clearfix">
{pathoptionvalue===4&&web_route!=null||pathoptionvalue===4&&has_web_route===true?<div className="edu-back-white mb10 clearfix">
<div className="padding40-20">
<p className="color-grey-6 font-16 mb20">Web路由</p>
<div className="df">

Write Preview
Loading…
Cancel
Save