{visible === true ?
{
teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
- this.Getdataback(jobsettingsdata, teacherdata)}> }
diff --git a/public/react/src/modules/user/MyEduCoderModal.js b/public/react/src/modules/user/MyEduCoderModal.js
new file mode 100644
index 000000000..cca6de622
--- /dev/null
+++ b/public/react/src/modules/user/MyEduCoderModal.js
@@ -0,0 +1,51 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import 'common.css'
+//立即申请试用
+class MyEduCoderModal extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state={
+
+ }
+ }
+
+ modalCancel=()=>{
+ //取消
+ }
+
+ setDownload=()=>{
+ //立即联系
+ }
+
+
+ render() {
+
+ return(
+
+
+
+ )
+ }
+}
+
+export default MyEduCoderModal;
\ No newline at end of file
diff --git a/public/react/src/modules/user/Notcompleted.js b/public/react/src/modules/user/Notcompleted.js
new file mode 100644
index 000000000..99c85c543
--- /dev/null
+++ b/public/react/src/modules/user/Notcompleted.js
@@ -0,0 +1,49 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import 'common.css'
+//完善个人资料
+class Notcompleted extends Component {
+
+ constructor(props) {
+ super(props);
+
+ }
+
+ modalCancel=()=>{
+ //取消
+ }
+
+ setDownload=()=>{
+ //立即联系
+ }
+
+
+ render() {
+
+ return(
+
+
+
+ )
+ }
+}
+
+export default Notcompleted;
\ No newline at end of file
diff --git a/public/react/src/modules/user/ReadPassword.js b/public/react/src/modules/user/ReadPassword.js
new file mode 100644
index 000000000..ef09d794e
--- /dev/null
+++ b/public/react/src/modules/user/ReadPassword.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import 'common.css'
+//密码已重置，请重新登录
+class ReadPassword extends Component {
+
+ constructor(props) {
+ super(props);
+
+ }
+
+
+ setDownload=()=>{
+ //立即联系
+ }
+
+
+ render() {
+
+ return(
+
+
+ )
+ }
+}
+
+export default ReadPassword;
\ No newline at end of file
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 77a3aee7d..0cbf13364 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -32,6 +32,10 @@
height: 45px;
}
+ .educouddiv {
+ display: flex;
+ justify-content: center;
+ }
.left_right {
+
- ) :(
-
- teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
- // 学生不能查看别人的
-
-
- {visibles === true ?
-
- )
)
}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 04bc935bc..5282b86a0 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -276,6 +276,7 @@ class ShixunHomeworkPage extends Component {
value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType}
+
/>
{parseInt(tab) === 0 &&
- this.cancelModulationModels()}
- />
-
- : ""
- }
-
+ this.cancelModulationModels()}
+ />
+
+ : ""
}
-
-
-
+ }
+
+ :
+ // 学生能查看别人的
+
+
+
- {computeTimetype===false?
+ {computeTimetype===false?
正在执行成绩计算，请稍后刷新页面查看结果
温馨提示：执行时间因作品数量而异
- :""}
+ :""}
- {JSON.stringify(data) !== "[]" ?
-
-
-
+
+ :
+
+ {JSON.stringify(data) !== "[]" ?
+
+
+
+
-
-
+
-
{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}已交{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}已交{teacherdata === undefined ? "" : teacherdata.uncommit_count}未交
{teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" :
{teacherdata.left_time.status}
@@ -2613,16 +2617,16 @@ class Listofworksstudentone extends Component {
}
-
+
+
-
- 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
- {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":
+ 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
+ {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":
{computeTimetype===true?
(this.props.isNotMember()===false?
-
+
- 计算成绩
-
- :"")
+
+ 计算成绩
+
+ :"")
:
(teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
this.props.isNotMember()===false?
@@ -2633,100 +2637,100 @@ class Listofworksstudentone extends Component {
}
}
-
-
-
-
- {data === undefined ? "222222" :
}
-
-
+ {data === undefined ? "222222" :
}
+
+
+
+ }
- :
-
+
+
+
+ ![]({getImageUrl("images/educoder/nodata.png")}/)
+
+
+ 没有数据可以显示！
+
-
- }
-
-
-
-
-
- 没有数据可以显示！
-
+
- :
- // 学生能查看别人的
-
- this.cancelModulationModels()}
- /> : ""
- }
-
+
+ {visibles === true ?
+ this.cancelModulationModels()}
+ /> : ""
+ }
+
+
-
-
+
+
- {computeTimetype===false?
+ {computeTimetype===false?
正在执行成绩计算，请稍后刷新页面查看结果
温馨提示：执行时间因作品数量而异
- :""}
-
-
-
+ }
- {/*///*/}
+ {/*///*/}
-
- {data === undefined ? "" :
}
-
- {JSON.stringify(datas) !== "[]" ?
-
-
- :
-
-
-
+ :""}
+
+
+
+
+ {data === undefined ? "" :
}
+
+ {JSON.stringify(datas) !== "[]" ?
+
+
-
+
+
{teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}
@@ -2739,8 +2743,8 @@ class Listofworksstudentone extends Component {
style={{"color": '#FF6800'}}>{teacherdata.left_time.time}}
-
-
*/}
-
+
+
- {/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}
- {/*
- 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
- {teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
+ 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}
+ {teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
{computeTimetype===true?
(this.props.isNotMember()===false?
:""):
+ teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+ (this.props.isNotMember()===false?
- 计算成绩
-
:""):
- teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
- (this.props.isNotMember()===false?
- 计算成绩
-
:"")
+ 计算成绩
+
+ 计算成绩
+
:"")
}
}
- */}
- {/*
+ {/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}
+ {/*- */}
- {/*
- */} +
*/}
+ {/*
*/}
+ {/*- */}
+ {/*
- */}
{/**/}
- {/*{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序*/}
+ {/*{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序*/}
{/**/}
{/*
- */}
- {/*
- this.funorder("updated_at")} data-remote="true"*/} - {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间 */} - {/*
- this.funorder("work_score")} data-remote="true"*/} - {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩 */} - {/*
- this.funorder("student_id")} data-remote="true"*/} - {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号 */} + {/*
- this.funorder("updated_at")} data-remote="true"*/} + {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间 */} + {/*
- this.funorder("work_score")} data-remote="true"*/} + {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩 */} + {/*
- this.funorder("student_id")} data-remote="true"*/} + {/*className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号 */} + {/*
*/}
{/*
-
-
+ :
+
- {datas === undefined ? "" :
}
-
- {
- teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-
-
+
+ {datas === undefined ? "" :
}
+
+ {
+ teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
+
+
+ : ""
+ }
+
+
-
+
- : ""
- }
-
+
+
+ 没有数据可以显示！
+
-
- }
+
-
-
-
-
-
- 没有数据可以显示！
-
+
+ 知道啦
+
+ 密码已重置，请重新登录