diff --git a/public/react/src/modules/courses/exercise/question/shixunAnswer.js b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
index 0ce4b3084..a1c4ff44b 100644
--- a/public/react/src/modules/courses/exercise/question/shixunAnswer.js
+++ b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
@@ -200,7 +200,7 @@ class shixunAnswer extends Component{
className:"edu-txt-center",
render:(testCount,item,index)=>{
return(
- { item.testCount ? item.testCount : "--" }
+ { item.testCount ? item.testCount : -- }
)
}
}, {
@@ -210,7 +210,7 @@ class shixunAnswer extends Component{
className:"edu-txt-center",
render:(endTime,item,index)=>{
return(
- { item.endTime ? item.endTime : "--" }
+ { item.endTime ? item.endTime : -- }
)
}
}, {
@@ -220,7 +220,7 @@ class shixunAnswer extends Component{
className:"edu-txt-center",
render:(needTime,item,index)=>{
return(
- { item.needTime ? item.needTime : "--" }
+ { item.needTime ? item.needTime : -- }
)
}
}, {
@@ -259,7 +259,7 @@ class shixunAnswer extends Component{
step={0.1}
precision={1}
value={item.input_score}
- style={{width:"60px",marginRight:"5px"}}
+ style={{width:"60px",marginLeft:"5px"}}
placeholder="请输入分数"
onChange={(value)=>{this.changeThis(value,index)}}
onBlur={(value)=>this.changeThisScore(value,item.id,index)}
@@ -269,9 +269,9 @@ class shixunAnswer extends Component{
}
{
item.operation ?
- this.scrollToAnchor(`${questionType.question_id}${index+1}`)}>查看
+ this.scrollToAnchor(`${questionType.question_id}${index+1}`)}>查看
:
- --
+ --
}
)
@@ -279,28 +279,38 @@ class shixunAnswer extends Component{
}];
return(
+
{ exercise && ((exercise.student_commit_status && exercise.student_commit_status != 0) || (exercise.user_exercise_status && exercise.user_exercise_status !=0) ) ?
阶段成绩
-
+
0 ? "pl30 pr30 resetTableStyle":"pl30 pr30 resetTableStyle stageTable"}>
{ data && data.length>0 ?
: "" }
{
challenge && challenge.length > 0 &&
-
实训详情
+
实训详情
{
challenge.map((item,key)=>{
return(
-
+
-
+
第{item[0].position}关
- {item[0].name}
+ {item[0].name}
@@ -308,7 +318,7 @@ class shixunAnswer extends Component{
{...this.props} {...this.state} challenge={item[0].outputs}
>
- { item[0].st===0 ?
+ { item[0].st===0 ?
最近通过的代码
@@ -316,7 +326,7 @@ class shixunAnswer extends Component{
-
+
-
+
{tableData && tableData.course_name}
>
{tableData.graduation_name}
@@ -111,9 +111,9 @@ class GraduateTopicDetail extends Component{
选题详情
- {tableData && tableData.graduation_topic_name}
-
- this.props.history.goBack()}>返回
+ {tableData && tableData.graduation_topic_name}
+
+ this.props.history.goBack()}>返回
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index 4e92f75ee..c9bd3f496 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -169,6 +169,7 @@ class GraduateTopicDetailTable extends Component{
} = this.state
const isAdmin =this.props.isAdmin();
const isStudent =this.props.isStudent();
+ const isNotMember=this.props.isNotMember();
console.log(un_addClass_notice)
return(
@@ -176,7 +177,7 @@ class GraduateTopicDetailTable extends Component{
序号
姓名
-
学号
+ {isNotMember ?"" :
学号}
分班
选题时间
操作
@@ -260,7 +261,7 @@ class GraduateTopicDetailTable extends Component{
{parseInt(key+1)+(parseInt(page-1)*15)}
{item.student_name}
- {item.student_id}
+ {isNotMember ?"" :{item.student_id}}
{item.class_group_name || "--"}
{item.selected_time}
{
@@ -288,6 +289,9 @@ class GraduateTopicDetailTable extends Component{
isAdmin &&
{item.result=== "待确认"?"--":item.result}
}
+ {
+ isNotMember && --
+ }
)
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 17a1b070e..7ccfae974 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -70,9 +70,9 @@ class GraduateTopicItem extends Component{
`}
{
- isNotMember?discussMessage.private_icon===true?
- {discussMessage.name}: this.toDetailPage(`${discussMessage.id}`)}
- className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:""
+ isNotMember && discussMessage.private_icon===true ?
+ {discussMessage.name}:
+ this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}
}
{
diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
index ceca9b291..f8846d751 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
@@ -192,7 +192,12 @@ class PollDetailTabFirst extends Component{
key: 'classes',
dataIndex: 'classes',
width:160,
- className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none"
+ className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none",
+ render:(classes,item,index)=>{
+ return(
+ item.classes ? {item.classes} : --
+ )
+ }
}, {
title: '提交状态',
dataIndex: 'status',
@@ -212,22 +217,42 @@ class PollDetailTabFirst extends Component{
width:160,
render:(time,item,index)=>{
return(
- item.time == null ? "--" : moment(item.time).format('YYYY-MM-DD HH:mm')
+ item.time == null ? -- : moment(item.time).format('YYYY-MM-DD HH:mm')
)
}
},{
title: '操作',
dataIndex: 'operation',
key: 'operation',
- className:poll_types && poll_types.un_anonymous ? "edu-txt-center":"edu-txt-center none",
+ className:"edu-txt-center",
width:120,
render:(operation,item,index)=>{
return(
- item.status == 1 ? 查看:--
+ item.status == 1 ? 查看:--
)
}
}];
+ // 非课堂成员不显示学号列
+ let isNotMember =this.props.isNotMember();
+ if(isNotMember){
+ columns.some((item,key)=> {
+ if (item.title === "学号") {
+ columns.splice(key, 1)
+ return true
+ }
+ }
+ )
+ }
// un_anonymous true为实名问卷,显示操作列,否则隐藏
+ if(poll_types && (isNotMember || poll_types.un_anonymous == false)){
+ columns.some((item,key)=> {
+ if (item.title === "操作") {
+ columns.splice(key, 1)
+ return true
+ }
+ }
+ )
+ }
return(
{