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
courseware
anke1460 5 years ago
parent 2d0e64997b 78ab3ab22e
commit 77b1ba6679
7 changed files with 602 additions and 431 deletions
Show Stats Download Patch File Download Diff File

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

@ -158,7 +158,7 @@ class LiveItem extends Component{
{ item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}
{ item.duration && <span className="mr50">直播预计时长：{item.duration}分钟</span> }
</span>
<span className="edu-txt-right" style={{width:"80px"}}>
<span className="edu-txt-right" style={{width:"120px"}}>
{
item.op_auth ?
<WordsBtn style="grey" onClick={()=>setLiveId(item.id)}>编辑</WordsBtn>:""

10
public/react/src/modules/courses/coursesDetail/CoursesBanner.js
Unescape View File

@ -404,7 +404,7 @@ class CoursesBanner extends Component {
exitclass=()=>{
this.setState({
modalsType: true,
modalsTopval: "退出后您将不再是本课题的成员,作品将全部被删除，",
modalsTopval: "退出后您将不再是本课堂的成员，作品将全部被删除，",
modalsBottomval:"确定要退出该课堂吗？",
metype:6
})
@ -620,7 +620,7 @@ class CoursesBanner extends Component {
</div>
<div className="clearfix ">
<div className="fl fl mr40 mb20" >
<div className="fl fl mr40" >
<div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
{coursedata.teacher_users.length===0?'':
<span className="color-white" >协作老师：
@ -765,12 +765,12 @@ background:rgba(204,204,204,0.2) !important;
placement="topLeft"
title={<pre className="antsoancss">
{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
<span >您有{coursedata.teacher_applies_count}条新的加入申请
<a className={"daishenp"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
<span>新收到{coursedata.teacher_applies_count}条加入课堂的申请
<a className={"daishenp ml5"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
<span style={{
color:"#FFA804"
}}>
待审批
去审批
</span></a></span>:""}</pre>}>
<span className="color-grey-c font-16" onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers")}>
<span className={"mr10"}>教师</span>

447
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -23,14 +23,18 @@ import './yslexercisetable.css';
import {getImageUrl, toPath, sortDirections} from 'educoder';
import NoneData from '../../../modules/courses/coursesPublic/NoneData';
import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise";
const Search = Input.Search;
const RadioGroup = Radio.Group;
const CheckboxGroup = Checkbox.Group;
const {Option} = Select;
//学生老师页面
let columnsystwo = [];
let myssubjective = 0; //是否显示主观题
let mysubjective_score = 0;//主观题得分
let myobjective_score = 0;//客观题得分
class Studentshavecompletedthelist extends Component {
// http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s
constructor(props) {
super(props);
this.state = {
@ -98,7 +102,8 @@ class Studentshavecompletedthelist extends Component {
{record.name === "--" ?
<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
:
<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}} title={record.name}>{record.name}</a>
<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center", width: '100px'}}
title={record.name}>{record.name}</a>
}
</span>
@ -240,7 +245,7 @@ class Studentshavecompletedthelist extends Component {
color: '#DD1717',
textAlign: "center",
width: '98px',
} : parseInt(record.completion) <= 90 ? {
} : parseInt(record.completion) <= 90 &&parseInt(record.completion)>60? {
color: '#FF6800',
textAlign: "center",
width: '98px',
@ -281,7 +286,7 @@ class Studentshavecompletedthelist extends Component {
color: '#DD1717',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) <= 90 ? {
} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore) >60? {
color: '#FF6800',
textAlign: "center",
width: '99px',
@ -289,7 +294,21 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
width: '99px',
} : {color: '#747A7F', textAlign: "center",width:'99px'}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</span>
}
</span>
)
@ -328,7 +347,7 @@ class Studentshavecompletedthelist extends Component {
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center"
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.efficiencyscore) <= 60 ? {
@ -342,24 +361,32 @@ class Studentshavecompletedthelist extends Component {
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
<span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
<span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<div>
<span>待批阅</span>
</div>
:
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
}
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center"
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.efficiencyscore) <= 60 ? {
@ -369,6 +396,17 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center"
}}>{record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</Tooltip>
}
</span>
@ -415,9 +453,11 @@ class Studentshavecompletedthelist extends Component {
<span className="maxnamewidth110 font-14">
{
record.name === "--" ?
<span className="maxnamewidth110" style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
<span className="maxnamewidth110"
style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
:
<span className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.name}</span>
<span className="maxnamewidth110"
style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.name}</span>
}
</span>
@ -554,7 +594,7 @@ class Studentshavecompletedthelist extends Component {
color: '#DD1717',
textAlign: "center",
width: '98px',
} : parseInt(record.completion) <= 90 ? {
} : parseInt(record.completion) <= 90 && parseInt(record.completion)>60? {
color: '#FF6800',
textAlign: "center",
width: '98px',
@ -593,7 +633,7 @@ class Studentshavecompletedthelist extends Component {
color: '#DD1717',
textAlign: "center",
width: '99px'
} : parseInt(record.levelscore) <= 90 ? {
} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) >60? {
color: '#FF6800',
textAlign: "center",
width: '99px'
@ -601,7 +641,21 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
width: '99px'
} : {color: '#747A7F', textAlign: "center", width:'99px'}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</span>
}
</span>
)
@ -639,7 +693,7 @@ class Studentshavecompletedthelist extends Component {
color: '#DD1717',
textAlign: "center",
width: "199px"
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
width: "199px"
@ -656,17 +710,25 @@ class Studentshavecompletedthelist extends Component {
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
<span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
<span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<div>
<span>待批阅</span>
</div>
:
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
}
</div>
}>
@ -674,7 +736,7 @@ class Studentshavecompletedthelist extends Component {
color: '#DD1717',
textAlign: "center",
width: "199px"
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
width: "199px"
@ -687,6 +749,17 @@ class Studentshavecompletedthelist extends Component {
textAlign: "center",
width: "199px"
}}>{record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</Tooltip>
}
@ -866,7 +939,7 @@ class Studentshavecompletedthelist extends Component {
<span style={parseInt(record.completion) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.completion) <= 90 ? {
} : parseInt(record.completion) <= 90&& parseInt(record.completion) >60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.completion) <= 60 ? {
@ -898,13 +971,27 @@ class Studentshavecompletedthelist extends Component {
<span style={parseInt(record.levelscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.levelscore) <= 90 ? {
} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore)>60? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.levelscore) <= 60 ? {
color: '#747A7F',
textAlign: "center",
} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</span>
}
</span>
@ -940,7 +1027,7 @@ class Studentshavecompletedthelist extends Component {
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 60 ? {
@ -954,24 +1041,32 @@ class Studentshavecompletedthelist extends Component {
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
<span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
<span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<div>
<span>待批阅</span>
</div>
:
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
</div>
}
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 60 ? {
@ -981,6 +1076,17 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
}}>{record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</Tooltip>
}
</span>
@ -1076,9 +1182,11 @@ class Studentshavecompletedthelist extends Component {
render: (text, record) => (
<span>
{record.classroom === "--" ?
<span style={{color: '#999999', textAlign: "center"}} className="maxnamewidth260">{record.classroom}</span>
<span style={{color: '#999999', textAlign: "center"}}
className="maxnamewidth260">{record.classroom}</span>
:
<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260" title={record.classroom}>{record.classroom}</a>
<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260"
title={record.classroom}>{record.classroom}</a>
}
</span>
)
@ -1130,10 +1238,26 @@ class Studentshavecompletedthelist extends Component {
className: "edu-txt-center font-14",
render: (text, record) => (
<span>
{record.completion=== "--"?
<span style={{color: '#999999', textAlign: "center"}}>--</span>
{
record.completion === "--" ?
<span style={{
color: '#999999',
textAlign: "center",
}}>--</span>
:
<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
<span style={parseInt(record.completion) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.completion) <= 90 && parseInt(record.completion) > 60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.completion) <= 60 ? {
color: '#747A7F',
textAlign: "center",
} : {
color: '#747A7F',
textAlign: "center",
}}>{record.completion}</span>
}
</span>
)
@ -1146,11 +1270,39 @@ class Studentshavecompletedthelist extends Component {
className: "edu-txt-center font-14",
render: (text, record) => (
<span>
{record.levelscore==="--"?
<span style={{color: '#999999', textAlign: "center"}}>--</span>
:
<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
{
record.levelscore === "--" ?
<span style={{
color: '#999999',
textAlign: "center",
}}>--</span> :
<span style={parseInt(record.levelscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.levelscore) <= 60 ? {
color: '#747A7F',
textAlign: "center",
} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
{
//主观题老师没有评分是
parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</span>
}
</span>
)
},
@ -1171,8 +1323,10 @@ class Studentshavecompletedthelist extends Component {
<Tooltip placement="bottom" title={<div>
<div>未评分</div>
</div>}>
<a style={{color: '#999999',
textAlign: "center",}}>--</a>
<a style={{
color: '#999999',
textAlign: "center",
}}>--</a>
</Tooltip>
:
record.commit_method === 5 ?
@ -1183,7 +1337,7 @@ class Studentshavecompletedthelist extends Component {
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 60 ? {
@ -1197,24 +1351,37 @@ class Studentshavecompletedthelist extends Component {
:
<Tooltip placement="right" title={<div>
<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
<span>客观题得分：0分</span> :
<span>客观题得分：{record.objective_score}分</span>}
</div>
<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
<span>主观题得分：0分</span> :
<span>主观题得分：{record.subjective_score}分</span>}
</div>
<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.efficiencyscore}分</span>}
{
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<div>
<span>待批阅</span>
</div>
:
<div>
{record.efficiencyscore === "--" ?
<span>最终成绩：0分</span>
:
<span>最终成绩：{record.efficiencyscore}分</span>
}
</div>
}
</div>
}>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 90 ? {
} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
color: '#FF6800',
textAlign: "center",
} : parseInt(record.efficiencyscore) <= 60 ? {
@ -1223,7 +1390,19 @@ class Studentshavecompletedthelist extends Component {
} : {
color: '#747A7F',
textAlign: "center",
}}>{record.efficiencyscore}</span>
}}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore}</span>
{//只有一个主观题的时候
parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
<span style={{
color: '#DD1717',
textAlign: "center",
marginLeft: "5px",
}}>
(待批阅)
</span> :
""
}
</Tooltip>
}
</span>
@ -1244,19 +1423,22 @@ class Studentshavecompletedthelist extends Component {
(//助教是否有权限
this.props.assistant_auth && this.props.assistant_auth === true ?
<a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
target="_blank"
onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
:
(//是否截止
this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
<a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
target="_blank"
onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
:
<span style={{textAlign: "center", color: '#999999'}}>--</span>
)
)
:
<a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
target="_blank"
onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
)
: record.submitstate === "已提交" ?
(//是否助教
@ -1302,8 +1484,10 @@ class Studentshavecompletedthelist extends Component {
}
{/* onClick={() => this.Adjustment(record.user_id)}>评阅</a>*/
}
{/*<span style={{textAlign: "center", color: '#999999'}}*/}
{/*>--</span>*/}
{/*<span style={{textAlign: "center", color: '#999999'}}*/
}
{/*>--</span>*/
}
// //console.log("Studentshavecompletedthelist");
// //console.log(props.current_status);
// columnsys 老师列表
@ -1391,6 +1575,17 @@ class Studentshavecompletedthelist extends Component {
limit: null,
}
}).then((response) => {
if (response === undefined) {
return
}
try {
myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
} catch (e) {
}
//学生
if (response.data.exercise_types.user_permission === 1) {
this.setState({
@ -1414,15 +1609,11 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnss.length; i++) {
var item = this.state.columnss[i];
if (item.title === "分班") {
}
else if(item.title==="客观题得分"){
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "客观题得分") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -1438,13 +1629,10 @@ class Studentshavecompletedthelist extends Component {
var item = this.state.columnss[i];
if (item.title === "客观题得分") {
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -1463,13 +1651,10 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnstwo.length; i++) {
var item = this.state.columnstwo[i];
if (item.title === "客观题得分") {
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -1478,13 +1663,10 @@ class Studentshavecompletedthelist extends Component {
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==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr2.push(item);
}
}
@ -1499,13 +1681,10 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnstwo.length; i++) {
var item = this.state.columnstwo[i];
if (item.title === "客观题得分") {
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -1513,13 +1692,10 @@ class Studentshavecompletedthelist extends Component {
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==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr2.push(item);
}
}
@ -1739,6 +1915,9 @@ class Studentshavecompletedthelist extends Component {
params: params
}).then((response) => {
// //console.log(JSON.stringify(response));
if (response === undefined) {
return
}
this.setState({
Teacherliststudentlist: response.data,
review: response.data.review,
@ -1747,19 +1926,23 @@ class Studentshavecompletedthelist extends Component {
current_answer_user: response.data.current_answer_user,
mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
})
try {
myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
} catch (e) {
}
if (response.data.exercise_types.subjective === 0) {
var arr = [];
for (var i = 0; i < this.state.columnstwo.length; i++) {
var item = this.state.columnstwo[i];
if (item.title === "客观题得分") {
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -1768,13 +1951,10 @@ class Studentshavecompletedthelist extends Component {
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==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr2.push(item);
}
}
@ -1871,13 +2051,10 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnsys.length; i++) {
var item = this.state.columnsys[i];
if (item.title === "客观题得分") {
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -1905,14 +2082,10 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnsys.length; i++) {
var item = this.state.columnsys[i];
if (item.title === "分班") {
}
else if(item.title==="客观题得分"){
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
}
else{
} else if (item.title === "客观题得分") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
} else {
arr.push(item);
}
}
@ -1945,10 +2118,8 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnsys.length; i++) {
var item = this.state.columnsys[i];
if (item.title === "客观题得分") {
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
} else {
arr.push(item);
@ -1979,12 +2150,9 @@ class Studentshavecompletedthelist extends Component {
for (var i = 0; i < this.state.columnsys.length; i++) {
var item = this.state.columnsys[i];
if (item.title === "分班") {
}
else if(item.title==="客观题得分"){
}
else if(item.title==="主观题得分"){
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (item.title === "客观题得分") {
} else if (item.title === "主观题得分") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
} else {
arr.push(item);
@ -2022,8 +2190,7 @@ class Studentshavecompletedthelist extends Component {
var item = this.state.columnsys[i];
if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -2047,11 +2214,9 @@ class Studentshavecompletedthelist extends Component {
var item = this.state.columnsys[i];
if (item.title === "分班") {
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -2094,11 +2259,9 @@ class Studentshavecompletedthelist extends Component {
var item = this.state.columnsys[i];
if (item.title === "分班") {
}
else if(this.props.isNotMember()===true&&item.title==="学号") {
} else if (this.props.isNotMember() === true && item.title === "学号") {
}
else{
} else {
arr.push(item);
}
}
@ -2161,9 +2324,18 @@ class Studentshavecompletedthelist extends Component {
if (response === undefined) {
return
}
this.setState({
loadingstate: false,
})
try {
myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
} catch (e) {
}
// //console.log(response);
// //console.log(1997);
this.Generatenewdatasy(response.data.exercise_users, response);
@ -2487,6 +2659,7 @@ class Studentshavecompletedthelist extends Component {
};
_getRequestParams() {
const {order, checkedValuesineinfo, course_groupyslstwo, searchtext, page, limit, course_groupyslsthree} = this.state
return {
@ -2701,7 +2874,6 @@ class Studentshavecompletedthelist extends Component {
}
this.setState({
testpapergradingboll: true,
exeuserid: e,
@ -2743,7 +2915,6 @@ class Studentshavecompletedthelist extends Component {
}
render() {
const isAdmin = this.props.isAdmin();

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

@ -305,7 +305,7 @@ class ShixunhomeWorkItem extends Component{
<div className="clearfix ds pr contentSection" >
<style>{`
.maxwidth333{
max-width: 333px;
max-width: 300px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -378,7 +378,7 @@ class ShixunhomeWorkItem extends Component{
}
{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400 "}>重命名</a>:""}
{this.props.isAdmin()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400 "}>重命名</a>:""}
{/*<WordsBtn className="btn colorblue ml20 font-16" to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>*/}
<WordsBtn className="btn colorblue font-16 ml15 fontweight400 " to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`} > 设置</WordsBtn>
</span>:""}

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

@ -1188,7 +1188,7 @@ class ShixunHomework extends Component{
</span>}
</span>
<li className="fr">
{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
<span>
<WordsBtn style="blue" className={"mr30 font-16"}>
<Link className="color4CACFF" to={`/classrooms/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>

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

@ -308,7 +308,7 @@ class OfficialAcademicTranscript extends Component {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 210px;
max-width: 200px;
text-align: left !important;
}
.TaskForms{

Write Preview
Loading…
Cancel
Save