diff --git a/app/models/shixun.rb b/app/models/shixun.rb index a2c66db79..a0f88260b 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -293,7 +293,7 @@ class Shixun < ApplicationRecord # 所属实践课程 def relation_path - subjects.published.unhidden.uniq + subjects.visible.unhidden.uniq end private diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css index 5693fcc2e..9b7edae1c 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css @@ -245,6 +245,7 @@ height: 60px; border-radius: 50% !important; box-shadow: 0px 0px 12px rgba(0,0,0,0.2); + border: 2px solid #459BE5; } .Competitioncenter{ @@ -308,6 +309,7 @@ width: 64px; height: 63px; border-radius: 50%; + border: 2px solid #459BE5; } .CompetitionsListzhezhao{ @@ -418,4 +420,10 @@ cursor: default; max-width: 100px; display: inherit; +} + +.competimgabsolute{ + position: absolute; + left: 106px; + bottom: -10px; } \ No newline at end of file diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js index 45b7fd3d2..1bf8f3ffa 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js @@ -201,7 +201,10 @@ class CompetitionContents extends Component{
- +
+ +
123
+

{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}

diff --git a/public/react/src/modules/courses/members/CourseGroupList.js b/public/react/src/modules/courses/members/CourseGroupList.js index 6c0e915cc..48bc2efcd 100644 --- a/public/react/src/modules/courses/members/CourseGroupList.js +++ b/public/react/src/modules/courses/members/CourseGroupList.js @@ -210,12 +210,11 @@ function CourseGroupList(props) { onPressEnter={onPressEnter} > - {!!none_group_member_count &&
+ {!!none_group_member_count &&
{props.history.push(`/courses/${courseId}/course_groups/0`)}}> 未分班: {none_group_member_count}个学生 - {props.history.push(`/courses/${courseId}/course_groups/0`)}}>查看 + 查看
} diff --git a/public/react/src/modules/courses/members/studentsList.css b/public/react/src/modules/courses/members/studentsList.css index 797305629..b2a41c7e6 100644 --- a/public/react/src/modules/courses/members/studentsList.css +++ b/public/react/src/modules/courses/members/studentsList.css @@ -1,4 +1,8 @@ .stu_table .ant-table-thead > tr > th, .stu_table .ant-table-tbody > tr > td, .courseGroupList .ant-table-thead > tr > th, .courseGroupList .ant-table-tbody > tr > td { padding: 14px 6px; +} + +.E9F8FF{ + background-color: #E9F8FF; } \ No newline at end of file