-
,
- isSingleButton: true
- })
- }
-
- const output_sets = {
- "test_sets": test_sets,
- "test_sets_array": test_sets,
- "had_test_count": had_test_count || test_sets_count,
- "test_sets_count": test_sets_count,
- // "had_passed_testsests_error_count": had_passed_testsests_error_count,
- "had_passed_testsests_error_count": test_sets_count - sets_error_count,
- "test_sets_hidden_count": test_sets_hidden_count,
- "test_sets_public_count": test_sets_public_count,
- "had_passed_testsests_hidden_count": had_passed_testsests_hidden_count,
- "had_passed_testsests_public_count": had_passed_testsests_public_count
- };
- // if (output_sets && output_sets.test_sets) {
- // const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
- // output_sets.test_sets_array = test_sets_array;
- // }
-
-
- this.setState({
- testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0), // 重置测试集展开状态
- currentGamePassed,
- currentPassedGameGainGold: gold,
- currentPassedGameGainExperience: experience,
-
- output_sets,
- game,
- next_game,
-
- latest_output: last_compile_output,
- record: record_consume_time,
- grade,
- had_done,
-
- })
- }
- resetTestSetsExpandedArray = () => {
- this.setState({
- testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0), // 重置测试集展开状态
- })
- }
-
- testSetUnlock() {
- const { game } = this.state;
- const url = `/v1/games/${game.identifier}/check_test_sets.json`
- axios.get(url, {
- withCredentials: true,
- })
- .then((response) => {
- // TODO status -2 重复操作，直接解锁
- if (response.data.test_sets == -1) {
- console.error('testSetUnlock失败！')
- this.showSnackbar(response.data.message)
- return;
- } else {
- // 被扣除的金币，是负数
- const deltaScore = response.data.score;
- // output_sets
- let { output_sets } = this.state;
- output_sets = Object.assign({}, output_sets);
- const test_sets_array = JSON.parse("[" + response.data.test_sets + "]");
- output_sets.test_sets_array = test_sets_array;
- this.setState({
- output_sets: output_sets,
- grade: this.state.grade + deltaScore,
- game : update(game, {test_sets_view: { $set: true }}),
- testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0)
- })
- this.handleGdialogClose();
- }
-
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
- handleSnackbarClose() {
- this.setState({
- snackbarOpen: false,
- snackbarVertical: '',
- snackbarHorizontal: '',
- })
- }
- // 全局的snackbar this.props.showSnackbar调用即可
- showSnackbar(text, vertical, horizontal) {
- this.setState({
- snackbarOpen: true,
- snackbarText: text,
- snackbarVertical: vertical,
- snackbarHorizontal: horizontal,
- })
- }
-
- /*
- TODO 写成HOC组件，更好复用
- 全局的Dialog this.props.showDialog调用即可
- @param contentText dialog显示的提示文本
- @param callback 确定按钮回调方法
- @param moreButtonsRender 除了“确定”、“取消”按钮外的其他按钮
- @param okButtonText “确定”按钮显示文本，如 继续查看
- */
- showDialog(params) {
- const { contentText, callback, moreButtonsRender, okButtonText, isSingleButton } = params;
-
- this.dialogOkCallback = callback;
- this.moreButtonsRender = moreButtonsRender
- this.okButtonText = okButtonText;
- this.isSingleButton = isSingleButton;
- this.setState({
- gDialogOpen: true,
- gDialogContentText: contentText
- })
- }
- onGdialogOkBtnClick() {
-
- this.dialogOkCallback && this.dialogOkCallback();
- // this.setState({
- // gDialogOpen: true
- // })
- }
- handleGdialogClose = () => {
- this.setState({
- gDialogOpen: false
- })
- }
- render() {
- const { classes } = this.props;
- return (
- 评测未通过
- 详情请参见“测试结果”
-
+
,
+ isSingleButton: true
+ })
+ }
+
+ const output_sets = {
+ "test_sets": test_sets,
+ "test_sets_array": test_sets,
+ "had_test_count": had_test_count || test_sets_count,
+ "test_sets_count": test_sets_count,
+ // "had_passed_testsests_error_count": had_passed_testsests_error_count,
+ "had_passed_testsests_error_count": test_sets_count - sets_error_count,
+ "test_sets_hidden_count": test_sets_hidden_count,
+ "test_sets_public_count": test_sets_public_count,
+ "had_passed_testsests_hidden_count": had_passed_testsests_hidden_count,
+ "had_passed_testsests_public_count": had_passed_testsests_public_count
+ };
+ // if (output_sets && output_sets.test_sets) {
+ // const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
+ // output_sets.test_sets_array = test_sets_array;
+ // }
+
+
+ this.setState({
+ testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0), // 重置测试集展开状态
+ currentGamePassed,
+ currentPassedGameGainGold: gold,
+ currentPassedGameGainExperience: experience,
+
+ output_sets,
+ game,
+ next_game,
+
+ latest_output: last_compile_output,
+ record: record_consume_time,
+ grade,
+ had_done,
+
+ })
+ }
+ resetTestSetsExpandedArray = () => {
+ this.setState({
+ testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0), // 重置测试集展开状态
+ })
+ }
+
+ testSetUnlock() {
+ const { game } = this.state;
+ const url = `/v1/games/${game.identifier}/check_test_sets.json`
+ axios.get(url, {
+ withCredentials: true,
+ })
+ .then((response) => {
+ // TODO status -2 重复操作，直接解锁
+ if (response.data.test_sets == -1) {
+ console.error('testSetUnlock失败！')
+ this.showSnackbar(response.data.message)
+ return;
+ } else {
+ // 被扣除的金币，是负数
+ const deltaScore = response.data.score;
+ // output_sets
+ let { output_sets } = this.state;
+ output_sets = Object.assign({}, output_sets);
+ const test_sets_array = JSON.parse("[" + response.data.test_sets + "]");
+ output_sets.test_sets_array = test_sets_array;
+ this.setState({
+ output_sets: output_sets,
+ grade: this.state.grade + deltaScore,
+ game : update(game, {test_sets_view: { $set: true }}),
+ testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0)
+ })
+ this.handleGdialogClose();
+ }
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+
+ handleSnackbarClose() {
+ this.setState({
+ snackbarOpen: false,
+ snackbarVertical: '',
+ snackbarHorizontal: '',
+ })
+ }
+ // 全局的snackbar this.props.showSnackbar调用即可
+ showSnackbar(text, vertical, horizontal) {
+ this.setState({
+ snackbarOpen: true,
+ snackbarText: text,
+ snackbarVertical: vertical,
+ snackbarHorizontal: horizontal,
+ })
+ }
+
+ /*
+ TODO 写成HOC组件，更好复用
+ 全局的Dialog this.props.showDialog调用即可
+ @param contentText dialog显示的提示文本
+ @param callback 确定按钮回调方法
+ @param moreButtonsRender 除了“确定”、“取消”按钮外的其他按钮
+ @param okButtonText “确定”按钮显示文本，如 继续查看
+ */
+ showDialog(params) {
+ const { contentText, callback, moreButtonsRender, okButtonText, isSingleButton } = params;
+
+ this.dialogOkCallback = callback;
+ this.moreButtonsRender = moreButtonsRender
+ this.okButtonText = okButtonText;
+ this.isSingleButton = isSingleButton;
+ this.setState({
+ gDialogOpen: true,
+ gDialogContentText: contentText
+ })
+ }
+ onGdialogOkBtnClick() {
+
+ this.dialogOkCallback && this.dialogOkCallback();
+ // this.setState({
+ // gDialogOpen: true
+ // })
+ }
+ handleGdialogClose = () => {
+ this.setState({
+ gDialogOpen: false
+ })
+ }
+ render() {
+ const { classes } = this.props;
+ return (
+ 评测未通过
+ 详情请参见“测试结果”
+
+
+
+ }])
+ if (!niPingAndIsStudent) {
+ columns.push({
+ width: 72,
+ title: '教师评分',
+ key: 'teacher_score',
+ dataIndex: 'teacher_score',
+
+ render: (teacher_score, record) => (
+
+
+
+ { renderScore(teacher_score) }
+
+
+ ),
+ })
+
+ columns.push({
+ width: 72,
+ title: '助教评分',
+ key: 'teaching_asistant_score',
+ dataIndex: 'teaching_asistant_score',
+ /**
+ * 2名助教进行了评分
+ 平均分：85.0分
+ *
+ */
+ render: (teaching_asistant_score, record) => (
- { renderScore(teacher_score) }
-
-
- ),
- }, {
- width: 72,
- title: '助教评分',
- key: 'teaching_asistant_score',
- dataIndex: 'teaching_asistant_score',
-/**
- * 2名助教进行了评分
-平均分：85.0分
- *
- */
- render: (teaching_asistant_score, record) => (
-
- {
-
) }
- >
-
- {renderScore(teaching_asistant_score) }
- }
-
- ),
- }])
+ {
{(description || (attachments && attachments.length != 0)) &&
}
+
{/* task_type={datalist&&datalist.task_type} */}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
index ad755338c..2ac4761e1 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
@@ -8,7 +8,6 @@ import { WordsBtn } from 'educoder'
import AccessoryModal2 from '../coursesPublic/AccessoryModal2'
import AccessoryModal from '../coursesPublic/AccessoryModal'
import axios from 'axios'
-import ConnectProject from './ConnectProject'
class CommonWorkItem extends Component{
constructor(props){
super(props);
@@ -98,6 +97,13 @@ class CommonWorkItem extends Component{
setupdate = () => {
}
+ toCreateProject = () => {
+ if (window.location.port == 3007) {
+ window.location.href = '/testbdweb.educoder.net/projects/new'
+ } else {
+ window.location.href = '/projects/new'
+ }
+ }
render(){
let { mainList,workType }=this.props;
const { aModalVisible, fileList, revise_reason } = this.state
@@ -128,7 +134,7 @@ class CommonWorkItem extends Component{
}
{
- mainList && mainList.homeworks.length>0 && mainList.homeworks.map((item,index)=>{
+ mainList && mainList.homeworks && mainList.homeworks.length>0 && mainList.homeworks.map((item,index)=>{
let canNotLink = !isAdminOrStudent && item.private_icon == true
return(
内容
@@ -209,7 +215,7 @@ class CommonWorkAppraise extends Component{
{ update_time &&
更新
- {update_user_name}
+ {update_user_name}
{moment(update_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(update_time).format('YYYY-MM-DD HH:mm')}
@@ -218,7 +224,7 @@ class CommonWorkAppraise extends Component{
{ commit_time &&
提交
- {author_name}
+ {author_name}
{moment(commit_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(commit_time).format('YYYY-MM-DD HH:mm')}
@@ -286,6 +292,7 @@ class CommonWorkAppraise extends Component{
@@ -196,12 +202,22 @@ class CommonWorkItem extends Component{
{ //
item.work_status && item.work_status.indexOf('关联项目') != -1 &&
-
+ this.props.toCreateProject(item)}>创建项目
+ this.props.openConnectionProject(item)}>关联项目
+
+ }
+
+ { //
+ item.work_status && item.work_status.indexOf('取消关联') != -1 &&
+ this.props.cancelConnectionProject(item)}>取消关联
}
{ //
item.work_status && item.work_status.indexOf('提交作品') != -1 &&
this.props.toWorkPostPage(this.props.match.params, item.homework_id)}>提交作品
}
+
+
{
//
item.work_status && item.work_status.indexOf('补交作品') != -1 &&
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 7142d3d00..a9090a02e 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -31,7 +31,9 @@ function renderScore(score, content) {
} else if (score >= 60) {
color = '#FF6800'
}
- return {score == '--' ? '--': (content || score)}
+ return
+ {score == null || score == undefined || score == '--' ? '--': (content || score)}
+
}
function getScoreTip(score, dom) {
return score == '--' ? '未评分' : score == '**' ? '未公开' : dom
@@ -47,9 +49,14 @@ function buildColumns(that, student_works) {
}
let courseId= that.props.match.params.coursesId;
let workId= that.props.match.params.workId;
- const { course_group_count } = that.state;
+ const { course_group_count, homework_status } = that.state;
const isAdmin = that.props.isAdmin()
const isAdminOrStudent = that.props.isAdminOrStudent()
+ const isStudent = that.props.isStudent()
+ const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1
+ // https://www.trustie.net/issues/21450 分组作业作品列表 学时视角，匿评阶段的列表显示信息不正确
+ const niPingAndIsStudent = isStudent && isNiPing
+
let columns = [{
width: 60,
title: '序号',
@@ -76,21 +83,24 @@ function buildColumns(that, student_works) {
{text}
),
- }, {
- width: 180,
- title: '学号',
- dataIndex: 'student_id',
- key: 'student_id',
-
- render: (text, record) => (
-
- {record.student_id}
-
- ),
}]
+ if (!niPingAndIsStudent) {
+ columns.push({
+ width: 88,
+ title: '学号',
+ dataIndex: 'student_id',
+ key: 'student_id',
+
+ render: (text, record) => (
+
+ {record.student_id}
+
+ ),
+ })
+ }
// TODO 只有有分班时才显示分班列
- if (course_group_count != 0) {
+ if (course_group_count != 0 && !niPingAndIsStudent) {
columns.push( {
title: '分班',
key: 'group_name',
@@ -103,7 +113,7 @@ function buildColumns(that, student_works) {
),
} )
}
- if (gotWorkGroup) {
+ if (gotWorkGroup && !niPingAndIsStudent) {
columns.push({
width: 72,
title: '分组',
@@ -144,7 +154,7 @@ function buildColumns(that, student_works) {
)},
}, {
- width: 133,
+ width: 150,
title: '更新时间',
dataIndex: 'update_time',
key: 'update_time',
@@ -154,45 +164,52 @@ function buildColumns(that, student_works) {
{update_time ? moment(update_time).format('YYYY-MM-DD hh:mm') : '--'}
),
- }, {
- width: 72,
- title: '教师评分',
- key: 'teacher_score',
- dataIndex: 'teacher_score',
-
- render: (teacher_score, record) => (
-
- {record.ta_comment_count}名助教进行了评分
- {that.state.ta_mode == 1 ? '平均分': '复审分'}：{teaching_asistant_score}分
- {record.ta_comment_count}名助教进行了评分
+ {that.state.ta_mode == 1 ? '平均分': '复审分'}：{teaching_asistant_score}分
+ ) }
+ >
+
+ {renderScore(teaching_asistant_score) }
+ {`${record.student_comment_count}名学生进行了匿评`}
+ {record.student_comment_count && {`${record.student_comment_count}名学生进行了匿评`}
}
有效平均分：{record.student_score}分
)
@@ -235,43 +252,45 @@ function buildColumns(that, student_works) {
{ !!appeal_all_count &&
{`${record.user_name}（${record.user_login}）`}
- { record.ultimate_score ?
- 最终调整成绩：{record.work_score}分
:
+ if (!niPingAndIsStudent) {
+ columns.push({
+ width: 72,
+ title: '最终成绩',
+ key: 'work_score',
+ dataIndex: 'work_score',
+ render: (work_score, record) => {
+ return (
+
+ 作业评分：{record.final_score}分
}
- { record.late_penalty >= 0 && 迟交扣分：{record.late_penalty}分
}
- { record.absence_penalty >= 0 && 缺评扣分：{record.absence_penalty}分
}
- { record.appeal_penalty >= 0 && 违规匿评扣分：{record.appeal_penalty}分
}
- 最终成绩：{record.work_score}分
- }
- )
- }>
- { renderScore(work_score) }
- {`${record.user_name}（${record.user_login}）`}
+ { record.ultimate_score ?
+ 最终调整成绩：{record.work_score}分
:
+
+ { record.final_score &&
}
+ )
+ }>
+ { renderScore(work_score) }
+ 作业评分：{record.final_score}分
}
+ { record.late_penalty >= 0 && 迟交扣分：{record.late_penalty}分
}
+ { record.absence_penalty >= 0 && 缺评扣分：{record.absence_penalty}分
}
+ { record.appeal_penalty >= 0 && 违规匿评扣分：{record.appeal_penalty}分
}
+ 最终成绩：{record.work_score}分
+
-
分组要求：
- 分组人数： {group_info.min_num} - {group_info.max_num} 人
- {group_info.base_on_project ? '基于项目实施' : '不基于项目实施'}：
+ 分组要求： {group_info.min_num} ~ {group_info.max_num}
+ {group_info.base_on_project ? '基于项目实施' : '不基于项目'}：
-
（提交作品时需要关联同组成员，组内成员作品共享）
- （{group_info.base_on_project ? '基于项目，则项目管理员角色的成员可以提交作品' : '非基于项目，则任意小组成员可以提交作品'}）
- （各小组必须在educoder平台创建项目）
+ （学生提交作品时需要关联同组成员，组内成员作品共享）
+ （{group_info.base_on_project ? '学生必须在本平台创建项目，项目管理员可以提交作品' : '无需再平台创建项目，任意小组成员均可以提交作品'}）
+ {/* （各小组必须在educoder平台创建项目）
*/}
允许学生对自己作品的匿评评分进行申诉，由教师和助教处理申诉
@@ -1297,7 +1319,7 @@ class CommonWorkSetting extends Component{
{appeal_time_tip}
}
@@ -1311,7 +1333,7 @@ class CommonWorkSetting extends Component{
/>
-
+ （学生违规匿评TA人作品时，其成绩将被扣减的分值）
{this.state.appeal_penalty_tip && {this.state.appeal_penalty_tip}
}
@@ -1346,21 +1368,17 @@ class CommonWorkSetting extends Component{
计算说明：
- 优先顺序排前的非零评分 * 100% -
- ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
- 例：有教师评分则教师评分100%，否则教辅评分100%，依次类推
- {/* 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百分比 -
- ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
-
-
+ 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百分比 - (
+ 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
注意
- 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外的评
- 分选项上。例如：教师评分40% + 助教评分35% + 学生匿评25%，学生A没
- 有得到教师评分，则最终成绩将按照助教评分55% + 学生匿评45%进行计算 */}
+ 非零百分比的评分选项，若评分记录为空，则其百分比将自动平摊到其它非零
+ 评分选项上。
+ 例：教师评分40% + 助教评分35% + 学生匿评25%，学生A没有教师评分记
+ 录，则其最终成绩按照助教评分55% + 学生匿评45%进行计算
{final_mode_false_tip}
}
+ 计算说明：
+
+ 优先顺序排前的非零评分 * 100% -
+ ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
+ 例：有教师评分则教师评分100%，否则教辅评分100%，依次类推
+ {/* 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百分比 -
+ ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
+
+
+ 注意
+ 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外的评
+ 分选项上。例如：教师评分40% + 助教评分35% + 学生匿评25%，学生A没
+ 有得到教师评分，则最终成绩将按照助教评分55% + 学生匿评45%进行计算 */}
+
+
教师评分 → 教辅评分 → 学生匿评评分
- （有教师评分则教师评分100%，否则教辅评分100%，依次类推 ）
+ {/* （有教师评分则教师评分100%，否则教辅评分100%，依次类推 ） */}
diff --git a/public/react/src/modules/courses/busyWork/ConnectProject.js b/public/react/src/modules/courses/busyWork/ConnectProject.js
index 9d201009d..73a4da8f8 100644
--- a/public/react/src/modules/courses/busyWork/ConnectProject.js
+++ b/public/react/src/modules/courses/busyWork/ConnectProject.js
@@ -5,6 +5,7 @@ import '../css/members.css'
import { WordsBtn } from 'educoder'
import axios from 'axios'
import InfiniteScroll from 'react-infinite-scroller';
+import NoneData from "../coursesPublic/NoneData"
const Search =Input.Search;
const LIMIT = 15
@@ -36,13 +37,14 @@ class ConnectProject extends Component{
this.connectProject(radioValue)
}
connectProject = (project_id) => {
- let workId=this.props.work.homework_id;
+ let workId=this.work.homework_id;
const url = `/homework_commons/${workId}/student_works/relate_project.json`
axios.post(url, {
project_id: project_id
}).then((result)=>{
if(result.data.status==0){
this.closeConnectionProject()
+ this.props.connectSuccess()
this.props.showNotification('关联成功')
}
}).catch((error)=>{
@@ -75,6 +77,9 @@ class ConnectProject extends Component{
loading: false,
hasMore: result.data.projects.length != 0
})
+ if (page == 1) {
+ this.setState({ haveProjects: result.data.projects.length > 0 })
+ }
}
}).catch((error)=>{
console.log(error);
@@ -84,11 +89,12 @@ class ConnectProject extends Component{
if (window.location.port == 3007) {
window.location.href = '/testbdweb.educoder.net/projects/new'
} else {
- window.location.href = '/educoder.net/projects/new'
+ window.location.href = '/projects/new'
}
}
//关联项目
- openConnectionProject=()=>{
+ openConnectionProject=(work)=>{
+ this.work = work;
this.fetchData()
this.setState({
project_flag:true
@@ -104,10 +110,9 @@ class ConnectProject extends Component{
}
render(){
- let {project_flag, projects, loading, hasMore }=this.state;
+ let {project_flag, projects, loading, hasMore, haveProjects }=this.state;
return(
+
+
*/}
+
{
- projects && !!projects.length &&
+ (projects && !!projects.length || this.state.keyword) &&
{this.setState({keyword: e.target.value})}}
onSearch={this.onSearchValue}
>
- (
-
{/* 作业问答 */}
(
- (
- (
+
{ projects.map(item => {
- return
@@ -145,7 +169,11 @@ class ConnectProject extends Component{
}
{
- (!projects || projects.length == 0) &&
+ haveProjects && projects.length == 0 &&
+
您当前尚未管理任何项目，请先创建项目 再关联
diff --git a/public/react/src/modules/courses/busyWork/Index.js b/public/react/src/modules/courses/busyWork/Index.js
index 1f03551fa..e109c36f5 100644
--- a/public/react/src/modules/courses/busyWork/Index.js
+++ b/public/react/src/modules/courses/busyWork/Index.js
@@ -75,12 +75,6 @@ class CoursesWorkIndex extends Component{
(props) => (}/images/edu_user/anony.png`})
+ }/images/${item.image_url}`})
+
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index e0333c333..3a1ab9331 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -1,7 +1,7 @@
import React, {Component} from 'react';
import {Link} from "react-router-dom";
import axios from 'axios';
-import {getImageUrl, trigger} from 'educoder';
+import {getImageUrl, trigger, on, off} from 'educoder';
import { Tooltip, message,Popover} from 'antd';
import CoursesListType from '../coursesPublic/CoursesListType';
import Addcourses from '../coursesPublic/Addcourses';
@@ -9,7 +9,6 @@ import '../css/Courses.css';
import Modals from "../../modals/Modals";
import AddStudentModal from '../members/modal/AddStudentModal'
import AddTeacherModal from '../members/modal/AddTeacherModal'
-import Trialapplication from "../../login/Trialapplication";
// 点击按钮复制功能
// function jsCopy(){
@@ -44,39 +43,33 @@ class CoursesBanner extends Component {
modalsBottomval: "",
antIcon:false,
coursedata:undefined,
- user_phone_binded:false,
- isRenders:false,
- showTrial:false,
}
- console.log("CoursesBanner");
- console.log("48");
- console.log(props);
}
componentDidMount() {
- this.updatabanner()
- this.setState({
- user_phone_binded :this.props.user_phone_binded,
- })
+
+ this.onloadupdatabanner()
+ on('updatabanner', this.updatabanner)
+ }
+ componentWillUnmount() {
+ off('updatabanner', this.updatabanner)
}
+
+
+ onloadupdatabanner=()=>{
+ this.updatabanner()
+ }
updatabanner=()=>{
let courseId = this.props.match.params.coursesId;
let url = "/courses/" + courseId + "/top_banner.json"
axios.get(url).then((result) => {
if( result!=undefined){
let data = result.data;
- if(result.data.status === 407){
- this.setState({
- isRenders:true,
- coursedata: data,
- showTrial:false,
- })
- }else{
this.setState({
coursedata: data,
- showTrial:true,
})
- }
+ }else{
+ this.onloadupdatabanner()
}
})
}
@@ -332,11 +325,10 @@ class CoursesBanner extends Component {
}
render() {
- let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,user_phone_binded} = this.state;
+ let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon} = this.state;
return (
-
@@ -370,7 +362,7 @@ class CoursesBanner extends Component {
{
coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":
-
+
{coursedata.name}
@@ -411,7 +403,9 @@ class CoursesBanner extends Component {
{coursedata.switch_to_student === true ?
-
+ 由教师/助教身份切换至学生
可进行提交作品、答题等操作 + }> this.switchidentity(1)} > 切换为学生 @@ -419,7 +413,9 @@ class CoursesBanner extends Component { :""} {coursedata.switch_to_teacher === true ? -
+ 由学生身份切换至教师
拥有添加成员、发布作业等管理权限 + }> this.switchidentity(2)} > 切换为老师 @@ -427,7 +423,9 @@ class CoursesBanner extends Component { {coursedata.switch_to_assistant === true ? -
+ 由学生身份切换至助教
拥有添加成员、发布作业等管理权限 + }> this.switchidentity(3)} > 切换为助教 @@ -466,7 +464,9 @@ class CoursesBanner extends Component { 学生 {coursedata.student_count} + className={coursedata.credit===null?"color-white fl font-16 bannerurlis":"color-white fl font-16 bannerurli"}> + {coursedata.student_count} + @@ -530,10 +530,13 @@ class CoursesBanner extends Component { {coursedata.code_halt === true? "已停用" : coursedata.invite_code} {coursedata.code_halt === true ? "" :
- 成员可以通过邀请码主动加入课堂
- 点击立刻复制邀请码 - + coursedata.code_halt === true?
可进行提交作品、答题等操作 + }> this.switchidentity(1)} > 切换为学生 @@ -419,7 +413,9 @@ class CoursesBanner extends Component { :""} {coursedata.switch_to_teacher === true ? -
拥有添加成员、发布作业等管理权限 + }> this.switchidentity(2)} > 切换为老师 @@ -427,7 +423,9 @@ class CoursesBanner extends Component { {coursedata.switch_to_assistant === true ? -
拥有添加成员、发布作业等管理权限 + }> this.switchidentity(3)} > 切换为助教 @@ -466,7 +464,9 @@ class CoursesBanner extends Component { 学生 {coursedata.student_count} + className={coursedata.credit===null?"color-white fl font-16 bannerurlis":"color-white fl font-16 bannerurli"}> + {coursedata.student_count} + @@ -530,10 +530,13 @@ class CoursesBanner extends Component { {coursedata.code_halt === true? "已停用" : coursedata.invite_code} {coursedata.code_halt === true ? "" :
- 点击立刻复制邀请码 - + coursedata.code_halt === true?
+ 邀请码已停用:
+ 成员不能主动加入课堂 +
+ 成员可以通过邀请码主动加入课堂}> { diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js index d0afc4b5b..f3212d9bd 100644 --- a/public/react/src/modules/courses/coursesPublic/Addcourses.js +++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js @@ -119,14 +119,29 @@ class Addcourses extends Component{ } submitasyn=(course_id)=>{ + let{professor}=this.state; + if(professor===1){ + this.setState({ + loadtype:true, + modalsType:true, + modalsTopval:"申请已提交，请等待审核", + modalSave:(course_id)=>this.submitasyns(course_id), + Addcoursestype:false + }) + this.props.hideAddcoursestype(); + }else{ + // let{course_id}=this.state; + this.setState({ + Addcoursestype:false + }) + this.props.hideAddcoursestype(); + window.location.href ="/courses/"+course_id+"/students"; + } - // let{course_id}=this.state; - this.setState({ - Addcoursestype:false - }) - this.props.hideAddcoursestype(); - window.location.href ="/courses/"+course_id+"/students"; } + submitasyns=(course_id)=>{ + window.location.href ="/courses/"+course_id+"/students"; + } submittojoinclass=()=>{ let {invite_code,professor,assistant_professor,student}=this.state; diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index 6bf85f3d2..787c70d3e 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -1,246 +1,246 @@ -import React,{ Component } from "react"; -import { Modal,Checkbox,Select,Input,Tooltip } from "antd"; -import axios from'axios'; -import Loading from '@icedesign/base/lib/loading'; -import '@icedesign/base/lib/loading/style.js'; -import Modals from '../../modals/Modals'; - -const Option = Select.Option; -const Search = Input.Search; -class PathModal extends Component{ - constructor(props){ - super(props); - this.state={ - StudentList_value:"", - Searchvalue:undefined, - type:'all', - page:1, - patheditarry:undefined - } - } - - hidecouseShixunModal=()=>{ - this.props.hidecouseShixunModal() - } - - //tag - changeTag=(types)=>{ - let {Searchvalue}=this.state; - this.setState({ - type:types, - page:1, - }) - this.props.funshixunpathlist(Searchvalue,types,true,1) - } - - //搜索 - SenttotheValue=(e)=>{ - this.setState({ - Searchvalue:e.target.value - }) - } - SenttotheSearch=(value)=>{ - let{type}=this.state; - this.setState({ - page:1, - }) - this.props.funshixunpathlist(value,type,true,1) - } - - - //勾选实训 - shixunhomeworkedit=(list)=>{ - this.setState({ - patheditarry:list - }) - // this.props.funpatheditarry(newpatheditarry) - } - - contentViewScrolledit=(e)=>{ - //滑动到底判断 - - if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - - let {Searchvalue,type,page,shixunpathlist}=this.state; - let newpage=page+1 - this.props.funshixunpathlist(Searchvalue,type,true,newpage) - this.setState({ - page:newpage - }) - - } - - } - //提交 - savecouseShixunModal=()=>{ - let {patheditarry}=this.state; - let {coursesId,Coursename,page,order,category_id,datas}=this.props; - let url="/courses/"+coursesId+"/homework_commons/create_subject_homework.json"; - if(patheditarry===undefined){ - this.setState({ - patheditarrytype:true, - patheditarryvalue:"请先选择实训课程" - }) - return - }else if(patheditarry.length===0){ - this.setState({ - patheditarrytype:true, - patheditarryvalue:"请先选择实训课程" - }) - return - } - axios.post(url, { - // category_id: datas&&datas.category_name===undefined||datas&&datas.category_name===null?undefined:category_id, - subject_ids:patheditarry, - } - ).then((response) => { - if(response.data.status===-1){ - // this.setState({ - // Modalstype:true, - // Modalstopval:response.data.message, - // ModalsBottomval:"", - // ModalSave:this.cancelmodel, - // Loadtype:true - // }) - this.props.showNotification(response.data.message) - - }else{ - // this.homeworkstart - //调用立即发布弹窗 - this.props.hidecouseShixunModal(); - this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids) - // this.props.showNotification("选用成功") - // this.props.showNotification(response.data.message) - // this.props.homeworkupdatalists(Coursename,page,order); - } - - // if(response.status===200) { - // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids) - // } - - - }).catch((error) => { - console.log(error) - }) - } - render(){ - let {Searchvalue,type,Modalstype}=this.state; - let {visible,shixunmodallist,hometypepvisible,newshixunmodallist}=this.props; - - - return( -
+ 点击立刻复制邀请码 +
- {/*提示*/}
- {Modalstype&&Modalstype===true?
-
-
-
-
-
- )
- }
-}
+import React,{ Component } from "react";
+import { Modal,Checkbox,Select,Input,Tooltip } from "antd";
+import axios from'axios';
+import Loading from '@icedesign/base/lib/loading';
+import '@icedesign/base/lib/loading/style.js';
+import Modals from '../../modals/Modals';
+
+const Option = Select.Option;
+const Search = Input.Search;
+class PathModal extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ StudentList_value:"",
+ Searchvalue:undefined,
+ type:'all',
+ page:1,
+ patheditarry:undefined
+ }
+ }
+
+ hidecouseShixunModal=()=>{
+ this.props.hidecouseShixunModal()
+ }
+
+ //tag
+ changeTag=(types)=>{
+ let {Searchvalue}=this.state;
+ this.setState({
+ type:types,
+ page:1,
+ })
+ this.props.funshixunpathlist(Searchvalue,types,true,1)
+ }
+
+ //搜索
+ SenttotheValue=(e)=>{
+ this.setState({
+ Searchvalue:e.target.value
+ })
+ }
+ SenttotheSearch=(value)=>{
+ let{type}=this.state;
+ this.setState({
+ page:1,
+ })
+ this.props.funshixunpathlist(value,type,true,1)
+ }
+
+
+ //勾选实训
+ shixunhomeworkedit=(list)=>{
+ this.setState({
+ patheditarry:list
+ })
+ // this.props.funpatheditarry(newpatheditarry)
+ }
+
+ contentViewScrolledit=(e)=>{
+ //滑动到底判断
+
+ if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+ let {Searchvalue,type,page,shixunpathlist}=this.state;
+ let newpage=page+1
+ this.props.funshixunpathlist(Searchvalue,type,true,newpage)
+ this.setState({
+ page:newpage
+ })
+
+ }
+
+ }
+ //提交
+ savecouseShixunModal=()=>{
+ let {patheditarry}=this.state;
+ let {coursesId,Coursename,page,order,category_id,datas}=this.props;
+ let url="/courses/"+coursesId+"/homework_commons/create_subject_homework.json";
+ if(patheditarry===undefined){
+ this.setState({
+ patheditarrytype:true,
+ patheditarryvalue:"请先选择实训课程"
+ })
+ return
+ }else if(patheditarry.length===0){
+ this.setState({
+ patheditarrytype:true,
+ patheditarryvalue:"请先选择实训课程"
+ })
+ return
+ }
+ axios.post(url, {
+ // category_id: datas&&datas.category_name===undefined||datas&&datas.category_name===null?undefined:category_id,
+ subject_ids:patheditarry,
+ }
+ ).then((response) => {
+ if(response.data.status===-1){
+ // this.setState({
+ // Modalstype:true,
+ // Modalstopval:response.data.message,
+ // ModalsBottomval:"",
+ // ModalSave:this.cancelmodel,
+ // Loadtype:true
+ // })
+ this.props.showNotification(response.data.message)
+
+ }else{
+ // this.homeworkstart
+ //调用立即发布弹窗
+ this.props.hidecouseShixunModal();
+ this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+ // this.props.showNotification("选用成功")
+ // this.props.showNotification(response.data.message)
+ // this.props.homeworkupdatalists(Coursename,page,order);
+ }
+
+ // if(response.status===200) {
+ // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+ // }
+
+
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ render(){
+ let {Searchvalue,type,Modalstype}=this.state;
+ let {visible,shixunmodallist,hometypepvisible,newshixunmodallist}=this.props;
+
+
+ return(
+
- { shixunmodallist && shixunmodallist.tags.length===0?"":
-
-
- this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部
- {
- shixunmodallist && shixunmodallist.tags.map((item,key)=>{
- return(
-
- this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}
-
- )
- })
- }
-
-
}
-
-
- 共
- {shixunmodallist === undefined ? "":shixunmodallist.subjects_count}
- 个实训
-
-
-
- this.SenttotheSearch(value)}
- style={{width: '100%'}}
- />
-
- -
-
- 实训路径名称 -
- 已发布实训数 -
- 使用人数 - -
-
-
- {
- newshixunmodallist&&newshixunmodallist.map((item,key)=>{
- return(
-
- )
- })
- }
-
-
-
- { this.state.patheditarrytype===true?{this.state.patheditarryvalue}:""}
-
-
+ {/*提示*/}
+ {Modalstype&&Modalstype===true?
+
+
+
+
+
+ )
+ }
+}
export default PathModal;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js
index 1b400b800..878395144 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectResource.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js
@@ -285,6 +285,11 @@ class Selectresource extends Component{
padding: 0 30px;
padding-top:30px;
}
+ .search-news{
+ width: 237px!important;
+ height: 30px;
+ margin-bottom: 30px;
+ }
`}
+ { shixunmodallist && shixunmodallist.tags.length===0?"":
+
+
+ this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部
+ {
+ shixunmodallist && shixunmodallist.tags.map((item,key)=>{
+ return(
+
+ this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}
+
+ )
+ })
+ }
+
+
}
+
+
+ 共
+ {shixunmodallist === undefined ? "":shixunmodallist.subjects_count}
+ 个实训
+
+
+
+ this.SenttotheSearch(value)}
+ style={{width: '115%'}}
+ />
+
+ -
+
- 实训路径名称 +
- 已发布实训数 +
- 使用人数 + +
+
+
+ {
+ newshixunmodallist&&newshixunmodallist.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+
+
+ { this.state.patheditarrytype===true?{this.state.patheditarryvalue}:""}
+
+
@@ -292,7 +297,7 @@ class Selectresource extends Component{
this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部
this.changeTag("my")} className={ type==="my" ? " active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>我的资源
-
+
- {item.response===undefined?"":isNaN(bytesToSize(item.response.filesize))?"":bytesToSize(item.response.filesize)}
+ {item.response===undefined?"":isNaN(this.props.bytesToSize(item.response.filesize))?"":this.props.bytesToSize(item.response.filesize)}
{
-
- let newpatheditarry=[];
- if (this.props.singleChoose == true) {
- if (list.length > 0) {
- newpatheditarry.push(list[list.length - 1])
- }
- } else {
- for(var i=0; i{
- //滑动到底判断
-
- if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
-
- let {Searchvalue,type,page}=this.state;
- let newpage=page+1
- this.props.funshixunmodallist(Searchvalue,type,true,newpage)
- this.setState({
- page:newpage
- })
-
- }
-
- }
-
- //搜索
- SenttotheValue=(e)=>{
- this.setState({
- Searchvalue:e.target.value
- })
- }
- SenttotheSearch=(value)=>{
- let{type}=this.state;
- this.setState({
- page:1,
- })
-
- this.props.funshixunmodallist(value,type,true,1)
- this.props.funpatheditarry([])
- }
-
- //tag
- changeTag=(types)=>{
- let {Searchvalue}=this.state;
- this.setState({
- type:types,
- page:1,
- })
-
- this.props.funshixunmodallist(Searchvalue,types,true,1)
- this.props.funpatheditarry([])
- }
-
-
- hidecouseShixunModal=()=>{
- this.props.hidecouseShixunModal()
- }
-
- savecouseShixunModal=()=>{
- let {coursesId,patheditarry,datas}=this.props;
-
- let{category_id}=this.state;
- if (this.props.chooseShixun) {
- this.props.chooseShixun(patheditarry)
- return;
- }
- if(patheditarry.length===0){
- this.setState({
- shixunmodelchke:true,
- chekicmessage:"请先选择实训"
- })
-
- return
- }
- let url="/courses/"+coursesId+"/homework_commons/create_shixun_homework.json";
- axios.post(url, {
- category_id:this.props.category_id===null||this.props.category_id===undefined?undefined:parseInt(this.props.category_id),
- shixun_ids:patheditarry,
- }
- ).then((response) => {
- if(response.data.status===-1){
- // this.props.showNotification(response.data.message)
-
- }else{
- this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
- this.props.hidecouseShixunModal()
- }
-
- // category_id: 3
- // homework_ids: (5) [9171, 9172, 9173, 9174, 9175]
- }).catch((error) => {
- console.log(error)
- })
- }
-
- selectCloseList=(value)=>{
- this.setState({
- category_id:value
- })
- }
- render(){
- let {Searchvalue,type,category_id}=this.state;
- let {visible,shixunmodallist,hometypepvisible,newshixunmodallist,patheditarry}=this.props;
- const antIcon = {
+ //滑动到底判断
+
+ if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+ let {Searchvalue,type,page}=this.state;
+ let newpage=page+1
+ this.props.funshixunmodallist(Searchvalue,type,true,newpage)
+ this.setState({
+ page:newpage
+ })
+
+ }
+
+ }
+
+ //搜索
+ SenttotheValue=(e)=>{
+ this.setState({
+ Searchvalue:e.target.value
+ })
+ }
+ SenttotheSearch=(value)=>{
+ let{type}=this.state;
+ this.setState({
+ page:1,
+ })
+
+ this.props.funshixunmodallist(value,type,true,1)
+ this.props.funpatheditarry([])
+ }
+
+ //tag
+ changeTag=(types)=>{
+ let {Searchvalue}=this.state;
+ this.setState({
+ type:types,
+ page:1,
+ })
+
+ this.props.funshixunmodallist(Searchvalue,types,true,1)
+ this.props.funpatheditarry([])
+ }
+
+
+ hidecouseShixunModal=()=>{
+ this.props.hidecouseShixunModal()
+ }
+
+ savecouseShixunModal=()=>{
+ let {coursesId,patheditarry,datas}=this.props;
+
+ let{category_id}=this.state;
+ if (this.props.chooseShixun) {
+ this.props.chooseShixun(patheditarry)
+ return;
+ }
+ if(patheditarry.length===0){
+ this.setState({
+ shixunmodelchke:true,
+ chekicmessage:"请先选择实训"
+ })
+
+ return
+ }
+ let url="/courses/"+coursesId+"/homework_commons/create_shixun_homework.json";
+ axios.post(url, {
+ category_id:this.props.category_id===null||this.props.category_id===undefined?undefined:parseInt(this.props.category_id),
+ shixun_ids:patheditarry,
+ }
+ ).then((response) => {
+ if(response.data.status===-1){
+ // this.props.showNotification(response.data.message)
+
+ }else{
+ this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+ this.props.hidecouseShixunModal()
+ }
+
+ // category_id: 3
+ // homework_ids: (5) [9171, 9172, 9173, 9174, 9175]
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+
+ selectCloseList=(value)=>{
+ this.setState({
+ category_id:value
+ })
+ }
+ render(){
+ let {Searchvalue,type,category_id}=this.state;
+ let {visible,shixunmodallist,hometypepvisible,newshixunmodallist,patheditarry}=this.props;
+ const antIcon =
-
-
-
-
- {this.props.isStudent?
-
- {this.props.data.task_operation&&this.props.data.task_operation?startbtn===false?this.taskoperationId( this.props.data.task_operation[1])}>
- {this.props.data.task_operation[0]}
- :"开启中":""}
- :""
- }
-
-
- )
- }
-}
+import React,{ Component } from "react";
+import { WordsBtn } from 'educoder';
+import {Tooltip,message,Modal,Spin} from 'antd';
+import {Link} from 'react-router-dom';
+import axios from 'axios';
+import Modals from '../../modals/Modals';
+
+
+class Startshixuntask extends Component{
+ constructor(props){
+ super(props);
+ this.state = {
+ startbtn:false,
+ isSpin:false,
+ }
+
+ }
+
+ componentDidMount() {
+
+ }
+
+ taskoperationId=(list)=>{
+ this.setState({
+ startbtn:true,
+ })
+ let url= list+".json";
+ axios.get(url).then((response) => {
+
+ if(response.status===200){
+ if(response.data.status===-2){
+
+ this.setState({
+ startbtn:false,
+ shixunsreplace:true,
+ hidestartshixunsreplacevalue:response.data.message+".json"
+ })
+ }else if(response.data.status===-1){
+ console.log(response)
+ }else if(response.data.status===-3){
+ this.setState({
+ shixunsmessage:response.data.message,
+ startshixunCombattype:true,
+ startbtn:false
+ })
+ }else{
+
+ if(response.data.status!=401&&response.data.status!=403){
+ window.location.href = "/tasks/"+response.data.game_identifier;
+ }
+
+ }
+ }
+ }).catch((error) => {
+ this.setState({
+ startbtn:false
+ })
+ });
+
+ }
+
+ hidestartshixunsreplace=(url)=>{
+ this.setState({
+ isSpin:true
+ })
+ axios.get(url).then((response) => {
+ if(response.status===200){
+
+ this.setState({
+ shixunsreplace:false,
+ isSpin:false,
+ })
+ message.success('重置成功，正在进入实训！');
+ let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
+ this.props.history.push(path);
+
+ }}
+ ).catch((error) => {
+ this.setState({
+ startbtn:false,
+ shixunsreplace:false,
+ isSpin:false,
+ })
+ });
+
+ }
+
+ hidestartshixunCombattype=()=>{
+ this.setState({
+ startshixunCombattype:false
+ })
+ }
+
+ render(){
+ let {
+ Modalstype,
+ Modalstopval,
+ Modalsbottomval,
+ cardsModalcancel,
+ cardsModalsavetype,
+ loadtype,
+ shixunsreplace,
+ hidestartshixunsreplacevalue,
+ startshixunCombattype,
+ shixunsmessage,
+ startbtn,
+ isSpin
+ } = this.state;
+
+ return(
+
+
+
+
+
+
+
+
+ {this.props.isStudent?
+
+ {this.props.data.task_operation&&this.props.data.task_operation?startbtn===false?this.taskoperationId( this.props.data.task_operation[1])}>
+ {this.props.data.task_operation[0]}
+ :"开启中":""}
+ :""
+ }
+
+
+ )
+ }
+}
export default Startshixuntask;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js b/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js
index 1cb47ae7e..d01c8d986 100644
--- a/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js
+++ b/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js
@@ -230,11 +230,11 @@ class ShixunModal extends Component{
this.SenttotheSearch(value)}
- style={{width: '100%'}}
+ style={{width: '115%'}}
/>
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index 544c44286..bdd597495 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -22,13 +22,6 @@ function disabledDateTime() {
};
}
-function bytesToSize(bytes) {
- if (bytes === 0) return '0 B';
- let k = 1024,
- sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
- i = Math.floor(Math.log(bytes) / Math.log(k));
- return (bytes / Math.pow(k, i)). toFixed(2) + ' ' + sizes[i];
-}
const dateFormat="YYYY-MM-DD HH:mm";
class Sendresource extends Component{
constructor(props){
@@ -456,7 +449,7 @@ class Sendresource extends Component{
{item.name}
- {item.response===undefined?"":isNaN(bytesToSize(item.response.filesize))?"":bytesToSize(item.response.filesize)}
+ {item.response===undefined?"":isNaN(this.props.bytesToSize(item.response.filesize))?"":this.props.bytesToSize(item.response.filesize)}
{
+ //onAttachmentRemove = (file) => {
// confirm({
// title: '确定要删除这个附件吗?',
@@ -228,14 +228,14 @@ class GraduationTasksSubmitedit extends Component{
// });
// return false;
- this.setState({
- Modalstype:true,
- Modalstopval:'确定要删除这个附件吗?',
- ModalSave: ()=>this.deleteAttachment(file),
- ModalCancel:this.cancelAttachment
- })
- return false;
- }
+ // this.setState({
+ // Modalstype:true,
+ // Modalstopval:'确定要删除这个附件吗?',
+ // ModalSave: ()=>this.deleteAttachment(file),
+ // ModalCancel:this.cancelAttachment
+ // })
+ // return false;
+ //}
cancelAttachment=()=>{
this.setState({
@@ -246,8 +246,8 @@ class GraduationTasksSubmitedit extends Component{
})
}
- deleteAttachment = (file) => {
- let {attachments}=this.state;
+ onAttachmentRemove = (file) => {
+ let {attachments,fileList}=this.state;
const url = `/attachments/${file.uid===undefined?file.id:file.uid}.json`
axios.delete(url, {
})
@@ -426,7 +426,7 @@ class GraduationTasksSubmitedit extends Component{
multiple: true,
// https://github.com/ant-design/ant-design/issues/15505
// showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
- // showUploadList: false,
+ showUploadList: false,
action: `${getUrl()}/api/attachments.json`,
onChange: this.handleChange,
onRemove: this.onAttachmentRemove,
@@ -553,7 +553,37 @@ class GraduationTasksSubmitedit extends Component{
)
})}
-
+
+ {this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{
+ return(
+
-
+
-
-
-
-
-
- {/**/}
- {/*{*/}
- {/*shixunmodallist === undefined ? "":shixunmodallist.homework_category.length>0?
- {this.state.shixunmodelchke===true?{this.state.chekicmessage}:""}
-
-
-
- )
- }
-}
+import React,{ Component } from "react";
+import { Modal,Checkbox,Select,Input,Tooltip,Spin,Icon} from "antd";
+import axios from'axios';
+// import Loading from '@icedesign/base/lib/loading';
+// import '@icedesign/base/lib/loading/style.js';
+
+const Option = Select.Option;
+const Search = Input.Search;
+class ShixunModal extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ Searchvalue:undefined,
+ type:'all',
+ category_id:0,
+ page:1
+ }
+ }
+ componentDidMount() {
+
+
+ }
+
+ //勾选实训
+ shixunhomeworkedit=(list)=>{
+
+ let newpatheditarry=[];
+ if (this.props.singleChoose == true) {
+ if (list.length > 0) {
+ newpatheditarry.push(list[list.length - 1])
+ }
+ } else {
+ for(var i=0; i*/}
-
- {/*
:""}*/}
-
- 选择目录名称：
*/}
- {/**/}
- {/**/}
- {/*{ shixunmodallist.main_category.map((item,key)=>{*/}
- {/*return(*/}
- {/**/}
- {/*)*/}
- {/*})*/}
- {/*}*/}
-
- {/*{*/}
- {/*shixunmodallist.homework_category.map((item,key)=>{*/}
- {/*return(*/}
- {/**/}
- {/*)*/}
- {/*})*/}
- {/*}*/}
-
- {/**/}
- {/*
*/}
-
- {/*
-
-
-
-
-
- this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部
-
-
- {
- shixunmodallist && shixunmodallist.tags.map((item,key)=>{
- return(
-
- this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}
-
- )
- })
- }
-
-
-
-
- 共
- {shixunmodallist === undefined ? "":shixunmodallist.shixuns_count}
- 个实训
-
-
- {
-
- }
-
- this.SenttotheSearch(value)}
- style={{width: '100%'}}
- />
-
- -
-
- 实训名称 -
- 使用院校 -
- 使用人数 -
- 评价等级 - -
-
- {/**/}
-
- {
- newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{
- return(
-
- {/* */}
-
-
-
-
- {item.shixun_name}
-
-
- {item.school_users}
- {item.myshixuns_count}
- {item.preference}
-
- 详情
-
-
- )
- })
- }
-
+
+
+
+
+ {/**/}
+ {/*{*/}
+ {/*shixunmodallist === undefined ? "":shixunmodallist.homework_category.length>0?
+ {this.state.shixunmodelchke===true?{this.state.chekicmessage}:""}
+
+
+
+ )
+ }
+}
export default ShixunModal;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
index 064ec645a..9cf44c9a7 100644
--- a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
+++ b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
@@ -1,163 +1,171 @@
-import React,{ Component } from "react";
-import { WordsBtn } from 'educoder';
-import {Tooltip,message,Modal} from 'antd';
-import {Link} from 'react-router-dom';
-import axios from 'axios';
-import Modals from '../../modals/Modals';
-
-
-
-class Startshixuntask extends Component{
- constructor(props){
- super(props);
- this.state = {
- startbtn:false
- }
-
- }
-
- componentDidMount() {
-
- }
-
- taskoperationId=(list)=>{
- this.setState({
- startbtn:true,
- })
- let url= list+".json";
- axios.get(url).then((response) => {
-
- if(response.status===200){
- if(response.data.status===-2){
-
- this.setState({
- startbtn:false,
- shixunsreplace:true,
- hidestartshixunsreplacevalue:response.data.message+".json"
- })
- }else if(response.data.status===-1){
- console.log(response)
- }else if(response.data.status===-3){
- this.setState({
- shixunsmessage:response.data.message,
- startshixunCombattype:true,
- startbtn:false
- })
- }else{
-
- if(response.data.status!=401&&response.data.status!=403){
- window.location.href = "/tasks/"+response.data.game_identifier;
- }
-
- }
- }
- }).catch((error) => {
- this.setState({
- startbtn:false
- })
- });
-
- }
-
- hidestartshixunsreplace=(url)=>{
- axios.get(url).then((response) => {
- if(response.status===200){
-
- this.setState({
- shixunsreplace:false
- })
- message.success('重置成功，正在进入实训！');
- let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
- this.props.history.push(path);
-
- }}
- ).catch((error) => {
- this.setState({
- startbtn:false,
- shixunsreplace:false
- })
- });
-
- }
-
- hidestartshixunCombattype=()=>{
- this.setState({
- startshixunCombattype:false
- })
- }
-
- render(){
- let {
- Modalstype,
- Modalstopval,
- Modalsbottomval,
- cardsModalcancel,
- cardsModalsavetype,
- loadtype,
- shixunsreplace,
- hidestartshixunsreplacevalue,
- startshixunCombattype,
- shixunsmessage,
- startbtn
- } = this.state;
-
- return(
-
- */}
+
+ {/*
:""}*/}
+
+ 选择目录名称：
*/}
+ {/**/}
+ {/**/}
+ {/*{ shixunmodallist.main_category.map((item,key)=>{*/}
+ {/*return(*/}
+ {/**/}
+ {/*)*/}
+ {/*})*/}
+ {/*}*/}
+
+ {/*{*/}
+ {/*shixunmodallist.homework_category.map((item,key)=>{*/}
+ {/*return(*/}
+ {/**/}
+ {/*)*/}
+ {/*})*/}
+ {/*}*/}
+
+ {/**/}
+ {/*
*/}
+
+ {/*
+
+
+
+
+
+ this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部
+
+
+ {
+ shixunmodallist && shixunmodallist.tags.map((item,key)=>{
+ return(
+
+ this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}
+
+ )
+ })
+ }
+
+
+
+
+ 共
+ {shixunmodallist === undefined ? "":shixunmodallist.shixuns_count}
+ 个实训
+
+
+ {
+
+ }
+
+ this.SenttotheSearch(value)}
+ style={{width: '115%'}}
+ />
+
+ -
+
- 实训名称 +
- 使用院校 +
- 使用人数 +
- 评价等级 + +
+
+ {/**/}
+
+ {
+ newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{
+ return(
+
+ {/* */}
+
+
+
+
+ {item.shixun_name}
+
+
+ {item.school_users}
+ {item.myshixuns_count}
+ {item.preference}
+
+ 详情
+
+
+ )
+ })
+ }
+
-
-
- 实训已经更新了，正在为您重置!
-
-
-
- {/*本实训的开启时间：{shixunsmessage}
开启时间之前不能挑战
-
*/} - {/*知道了*/} - {/*
*/} -
+
+
+ 实训已经更新了，正在为您重置!
+
+
+
+ {/*本实训的开启时间：{shixunsmessage}
开启时间之前不能挑战
+
*/} + {/*知道了*/} + {/*
*/} ++ + + + + {item.name} + + + {item.response===undefined?"":isNaN(this.props.bytesToSize(item.response.filesize))?"":this.props.bytesToSize(item.response.filesize)} + + this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}> +
+ ) + })} @@ -571,7 +601,7 @@ class GraduationTasksSubmitedit extends Component{成员要求：2～5人
+
- {memberslist&&memberslist.members.map((item,key)=>{
+ {memberslist===undefined?"":memberslist.members.length===0?
+
+
)
})}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index fd0e265c5..b68458e3f 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -2,7 +2,7 @@ import React,{Component} from "React";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip,Spin} from "antd";
import {Link} from 'react-router-dom';
import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import { WordsBtn,getUrl } from 'educoder';
+import { WordsBtn,getUrl,getImageUrl} from 'educoder';
import axios from 'axios';
import Modals from '../../../modals/Modals';
const Search = Input.Search;
@@ -83,7 +83,7 @@ class GraduationTasksSubmitnew extends Component{
}
handleSubmit=(e) => {
-
+ console.log("86");
let {fileList,selectmemberslist,workslist}=this.state;
if(fileList.length === 0){
@@ -91,7 +91,7 @@ class GraduationTasksSubmitnew extends Component{
Modalstype:true,
Modalstopval:'请上传附件!',
Loadtype:true,
- ModalCancel:this.cancelAttachment
+ ModalSave:this.cancelAttachment,
})
@@ -119,7 +119,7 @@ class GraduationTasksSubmitnew extends Component{
listid.push(list.response.id)
}
- e.preventDefault();
+ // e.preventDefault();
if( GraduationTasksnewtype===true){
this.props.form.validateFields((err, values) => {
if (!err) {
@@ -367,7 +367,6 @@ class GraduationTasksSubmitnew extends Component{
let newlist =memberslist.members;
let newcheckedValues=checkedValues;
let selects=[];
-
selects.push(selectobjct)
for(var i=0; i {
+ if (e.keyCode === 13) {
+ }
+ }
+ onSearckeyd=(e)=>{
+ if(e.keyCode){
+
+ let {search} = this.state;
+ this.searchList(search,1,10)
+ }
+ }
+ onSearchKeywordKeyUps= (e)=>{
+ if(e.keyCode=== 13){
+ }
+ }
+ onKeywordSearchKeyDown = (e) => {
+ if(e.keyCode == 13) {
+ return false;
+ }
+ }
gocannel=()=>{
window.history.go(-1)
}
@@ -482,7 +503,8 @@ render(){
返回
-
}
{datalist&&datalist.project_info===undefined?"":
+
:memberslist&&memberslist.members.map((item,key)=>{
return(
+ ![]({getImageUrl("images/educoder/nodata.png")}/)
+
+
+ 未找到包含{search}的学生
+
- {
+ return parseInt(task_status[key])===item.user_id?true:false
+ })
+ }
+ disabled={item.commit_status===true?true:false} className="fl ">
+
+
+
)
})}
@@ -622,10 +680,12 @@ class GraduationTasksSubmitedit extends Component{
height: '30px',
display:item.user_name===undefined?"none":""
}}>
- {item.user_name}
- {item.group_name}
- {item.student_id}
- {item.commit_status===true?已提交 :""}
+ {item.user_name}
+ {item.group_name}
+ {item.student_id}
+ {item.commit_status===false?已提交 :""}
{item.user_name}
- {item.group_name}
- {item.student_id}
- {key>0?this.delecttask_status(item.user_id)}>
:""}
+ {item.user_name}
+ {item.group_name}
+ {item.student_id}
+ {key>0?this.delecttask_status(item.user_id)}>
:""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
index e722ac00b..15300c628 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
@@ -197,7 +197,6 @@ class GraduationTasksappraiseMainEditor extends Component{
.mainEditor {
padding: 0 10px;
padding-bottom: 8px;
- height: 288px;
}
.mainEditorTitle {
margin-bottom: 6px;
@@ -218,7 +217,7 @@ class GraduationTasksappraiseMainEditor extends Component{
-
+
tr:last-child > td{
- border:none!important;
- }
`
}
@@ -1548,24 +1545,43 @@ class GraduationTaskssettinglist extends Component{
{
@@ -1785,24 +1801,49 @@ class GraduationTaskssettinglist extends Component{
+ }>
+
+
+
+
}
@@ -528,7 +543,7 @@ class studentsList extends Component{
total_count > 0 ?
- {this.props.isAdmin()?{taskslistdata&&taskslistdata.work_count}个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） :""}
- {
- this.props.isAdmin() ?
-
+ {this.props.isStudent()===true?
+
-
- {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序
-
- this.funorder("work_score" )}>最终成绩
+
+ this.funorder("student_id" )}>学生学号
+
+
+
:""}
-
-
- this.funorder("updated_at")}>更新时间 -
- this.funorder("work_score" )}>最终成绩 -
- this.funorder("student_id" )}>学生学号 -
+
- :""
- }
+ + + {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序 +
+-
+
- this.funorder("updated_at")}>更新时间 -
+
+ {taskslistdata&&taskslistdata.commit_count}
+ 已交
+
+ {taskslistdata&&taskslistdata.uncommit_count}
+ 未交
+
+
+ {taskslistdata&&taskslistdata.left_time.status} :
+
+ {taskslistdata&&taskslistdata.left_time.time}
+
+
+
+ :""}
+
-
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index e75baa3fe..3cb9bff77 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -1,5 +1,5 @@
import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin} from "antd";
+import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin, Tooltip} from "antd";
import ClipboardJS from 'clipboard'
import '../css/Courses.css'
import '../css/members.css'
@@ -31,14 +31,6 @@ const dataSource = [{
const buildColumns = (that) => {
const columns=[{
- title: '',
- dataIndex: 'check',
- key: 'check',
- render: (text, item) => {
- return
- {taskslistdata&&taskslistdata.work_count}个检索结果（{taskslistdata&&taskslistdata.work_count} 学生）
-
-
-
+ {this.props.isAdmin()===true?
+
+
+ {taskslistdata&&taskslistdata.work_count}
+ 个检索结果（{taskslistdata&&taskslistdata.work_count} 学生）
+
+
+
+ :""}
+
+
+ {this.props.isStudent()===true?
+
+
+ {taskslistdata&&taskslistdata.commit_count}
+ 已交
+
+ {taskslistdata&&taskslistdata.uncommit_count}
+ 未交
+
+
+ {taskslistdata&&taskslistdata.left_time.status} :
+
+ {taskslistdata&&taskslistdata.left_time.time}
+
+
+
+ :""}
+
+
成员可以通过邀请码主动加入课堂
+ 点击立刻复制邀请码
+
- 已选 {checkBoxValues.length} 个
+ {isAdmin && 已选 {checkBoxValues.length} 个 }
管理权限 ,
width: 230,
key: 'course_groups',
@@ -116,7 +109,8 @@ function buildColumns(that) {
}
,
});
- if (that.hasGraduationModule()) {
+ const hasGraduationModule = that.hasGraduationModule()
+ if (hasGraduationModule) {
columns.push({
title: '答辩组',
key: 'graduation_group',
@@ -156,6 +150,16 @@ function buildColumns(that) {
},
})
}
+ if(isAdmin && hasGraduationModule) {
+ columns.unshift({
+ title: '',
+ dataIndex: 'course_member_id',
+ key: 'course_member_id',
+ render: (content, item, index) => {
+ return
@@ -544,9 +558,9 @@ class studentsList extends Component{
`}
{isAdmin && 删除 }
{isAdmin &&
@@ -562,8 +577,8 @@ class studentsList extends Component{
{currentOrderName}
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 0ee44c210..b474547b8 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -32,13 +32,6 @@ function buildColumns(that) {
const isAdminOrTeacher = that.props.isAdminOrTeacher()
const { course_groups } = that.state
const columns = [{
- title: '',
- dataIndex: 'course_member_id',
- key: 'course_member_id',
- render: (content, item, index) => {
- return -
-
- this.onSortTypeChange(ORDER_BY_NUM)} >学号排序 -
- this.onSortTypeChange(ORDER_BY_GROUP)} >分班排序 +
- this.onSortTypeChange(ORDER_BY_NUM)} >学生学号 +
- this.onSortTypeChange(ORDER_BY_GROUP)} >分班名称
- 已选 {checkBoxValues.length} 个
+ { isAdmin && hasGraduationModule && 已选 {checkBoxValues.length} 个 }
{
- { this.hasGraduationModule() && isAdminOrTeacher &&
+ { hasGraduationModule && isAdminOrTeacher &&
加入答辩组
-
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index ad5a07432..4193cdc62 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -340,8 +340,8 @@ class PollDetailTabForthRules extends Component{
- {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.username} 通关：{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.complete_count}/{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.challenges_count} -
- 完成效率：{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.efficiency} -
- 通关时间： {this.props.viewtrainingdata === undefined ? "":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"--":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')} +
- 课堂最高完成效率： {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.max_efficiency} -
- 总耗时: {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.total_spend_time} +
- {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.username} 通关：{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.complete_count}/{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.challenges_count} +
- 完成效率：{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.efficiency} +
- 通关时间： {this.props.viewtrainingdata === undefined ? "":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"--":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')} +
- 课堂最高完成效率： {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.max_efficiency} +
- 总耗时: {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.total_spend_time} +
- (学生收到{this.props.type==="Exercise"?"试卷":"问卷"}的时间) - (学生可以答题的时间截点) + (学生收到{this.props.moduleName || (this.props.type==="Exercise"?"试卷":"问卷")}的时间) + ({this.props.moduleName == '作业' ? '学生“按时”提交作品的时间截点' : '学生可以答题的时间截点'})
{ diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 3e3bf95c4..62953fedb 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -299,9 +299,11 @@ class Listofworks extends Component { var data = { search: "", order: "", - b_order: "", + b_order: "asc", work_status: "", course_group: "", + page:1, + limit:20, } axios.post(urll, data).then((result) => { if (result !== undefined) { diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 673d864de..f456cdd5d 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -90,7 +90,9 @@ class Listofworksstudentone extends Component { var data = { search: "", order: "", - b_order: "", + b_order: "asc", + page:1, + limit:20, work_status: "", course_group: "", } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 8ad70753f..272ac6418 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -210,7 +210,7 @@ class ShixunhomeWorkItem extends Component{
this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了！
+ onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了
@@ -128,62 +179,81 @@ class TraineetraininginformationModal extends Component {
onCancel={this.Cancel}
>
-
- {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_name}
- 经验值： {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}
+
-
+
+
+
+
+ {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_name}
+ 经验值： {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}
+
{/**/}
-
- 实训报告
-
+
{/*这里到时候要做判断*/}
- 
-
-
-
-
-
- {
- this.props.game_list === undefined?"" : this.props.game_list.length<4?
-
- :""
- }
-
-
- {this.props.game_list === undefined ? "" :
+
+
+
![]({getImageUrl("images/educoder/icon/charpter-white.svg")}){kind=icon}
- ![Shixun0]({getImageUrl("/images/educoder/index/shixun/shixun0.jpg?1546937140")}/)
*/}
- {/*![]({getImageUrl("/images/educoder/icon/charpter-white.svg")}){kind=icon}
*/}
- {/*![]({getImageUrl("images/educoder/problem.png"))
![]({getImageUrl("images/educoder/icon/edit.svg")}){kind=icon}
@@ -249,7 +249,7 @@ class Challenges extends Component {
![]({getImageUrl("images/educoder/icon/close.svg")}){kind=icon}
@@ -371,7 +371,7 @@ class Challenges extends Component {
{item.up_url != undefined &&
![]({getImageUrl("images/educoder/icon/moveup.svg")}){kind=icon}
@@ -381,7 +381,7 @@ class Challenges extends Component {
{item.down_url != undefined &&
![]({getImageUrl("images/educoder/icon/movedown.svg")}){kind=icon}