diff --git a/public/react/src/common/course/WordsBtn.js b/public/react/src/common/course/WordsBtn.js
index 521a16ddd..698da6d5f 100644
--- a/public/react/src/common/course/WordsBtn.js
+++ b/public/react/src/common/course/WordsBtn.js
@@ -1,24 +1,24 @@
-import React, { Component } from 'react';
-import {Link} from 'react-router-dom'
-
-const map={"blue":"colorblue","white":"colorwhite","grey":"colorgrey", 'orange': "color-orange"}
-class WordsBtn extends Component {
- constructor(props) {
- super(props);
- }
-
- render() {
- let{to, href}=this.props
- return(
-
- {
- to==undefined ?
- {this.props.children}
- :
- {this.props.children}
- }
-
- )
- }
-}
+import React, { Component } from 'react';
+import {Link} from 'react-router-dom'
+
+const map={"blue":"colorblue","white":"colorwhite","grey":"colorgrey", 'orange': "color-orange"}
+class WordsBtn extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ let{to, href,target}=this.props
+ return(
+
+ {
+ to==undefined ?
+ {this.props.children}
+ :
+ {this.props.children}
+ }
+
+ )
+ }
+}
export default WordsBtn;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/busyWork/common.js b/public/react/src/modules/courses/busyWork/common.js
index 7f54a0623..b1828997b 100644
--- a/public/react/src/modules/courses/busyWork/common.js
+++ b/public/react/src/modules/courses/busyWork/common.js
@@ -1,184 +1,184 @@
-import React, { Component } from 'react';
-export const STATUS_UN_PUBLISH = "未发布"
-// homework_status: ["提交中", "未开启补交"]
-export const STATUS_SUBMIT = "提交中"
-// export const STATUS_UN_PUBLISH = "未发布"
-
-// homework_status: ["提交中"] 未发布 未开启补交
-
-
-export function RouteHOC(options = {}) {
- return function wrap(WrappedComponent) {
- return class Wrapper extends Component {
- constructor(props) {
- super(props);
-
- this.state = {
-
- }
- }
- toCreateProject = () => {
- let url = '/projects/new'
- if (window.location.port == 3007) {
- // window.location.href
- url = '/testbdweb.educoder.net/projects/new'
- }
- window.open(
- url,
- '_blank' // <- This is what makes it open in a new window.
- );
- }
- // common_homework group_homework
- // 是否是分组作业
- isGroup = () => {
- return window.location.pathname.indexOf('group_homeworks') != -1
- }
- getModuleName = (isChinese) => {
- const isGroup = this.isGroup()
- if (isChinese) {
- let chName = isGroup ? '分组作业' : '普通作业'
- return chName;
- }
- const secondName = isGroup ? 'group_homeworks' : 'common_homeworks'
- return secondName;
- }
- getModuleType = () => {
- const isGroup = this.isGroup()
- return isGroup ? 3 : 1
- }
- toDetailPage = (_courseId, workId, topicId) => {
- if (typeof _courseId == "object") {
- const topicId = _courseId.topicId
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/boards/${workId}/messages/${topicId}`)
- } else {
- this.props.history.push(`/courses/${_courseId}/boards/${workId}/messages/${topicId}`)
- }
-
- }
- toEditPage = (_courseId, _workId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/edit`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/edit`)
- }
- }
- toWorkDetailPage = (_courseId, _workId, _studentWorkId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- const studentWorkId = _courseId.studentWorkId
- this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/${_studentWorkId || studentWorkId}/appraise`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`)
- }
- }
- toNewPage = (courseId) => {
- const secondName = this.getModuleName()
- this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
- }
- toListPage = (_courseId, _workId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}${_workId ? '/' + _workId : ''}`)
- }
- }
-
-
- toWorkPostPage = (_courseId, _workId, isEdit, _studentWorkId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- const studentWorkId = _courseId.studentWorkId
- this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/${isEdit? `${_studentWorkId || studentWorkId}/post_edit` : 'post'}`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/${isEdit? `${_studentWorkId}/post_edit` : 'post'}`)
- }
- }
- toWorkListPage = (_courseId, _workId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/list`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/list`)
- }
- }
- toWorkAnswerPage = (_courseId, _workId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/answer`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/answer`)
- }
- }
-
- toWorkQuestionPage = (_courseId, _workId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _workId || _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/question`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/question`)
- }
- }
-
- toWorkSettingPage = (_courseId, _workId) => {
- const secondName = this.getModuleName()
- if (typeof _courseId == "object") {
- const workId = _courseId.workId
- const courseId = _courseId.coursesId
- this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/setting`)
- } else {
- this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/setting`)
- }
- }
-
-
-
- render() {
- const { snackbarOpen} = this.state;
- return (
-
-
-
-
-
- )
- }
- }
- }
+import React, { Component } from 'react';
+export const STATUS_UN_PUBLISH = "未发布"
+// homework_status: ["提交中", "未开启补交"]
+export const STATUS_SUBMIT = "提交中"
+// export const STATUS_UN_PUBLISH = "未发布"
+
+// homework_status: ["提交中"] 未发布 未开启补交
+
+
+export function RouteHOC(options = {}) {
+ return function wrap(WrappedComponent) {
+ return class Wrapper extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+
+ }
+ }
+ toCreateProject = () => {
+ let url = '/projects/new'
+ if (window.location.port == 3007) {
+ // window.location.href
+ url = '/testbdweb.educoder.net/projects/new'
+ }
+ window.open(
+ url,
+ '_blank' // <- This is what makes it open in a new window.
+ );
+ }
+ // common_homework group_homework
+ // 是否是分组作业
+ isGroup = () => {
+ return window.location.pathname.indexOf('group_homeworks') != -1
+ }
+ getModuleName = (isChinese) => {
+ const isGroup = this.isGroup()
+ if (isChinese) {
+ let chName = isGroup ? '分组作业' : '普通作业'
+ return chName;
+ }
+ const secondName = isGroup ? 'group_homeworks' : 'common_homeworks'
+ return secondName;
+ }
+ getModuleType = () => {
+ const isGroup = this.isGroup()
+ return isGroup ? 3 : 1
+ }
+ toDetailPage = (_courseId, workId, topicId) => {
+ if (typeof _courseId == "object") {
+ const topicId = _courseId.topicId
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/boards/${workId}/messages/${topicId}`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/boards/${workId}/messages/${topicId}`)
+ }
+
+ }
+ toEditPage = (_courseId, _workId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/edit`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/edit`)
+ }
+ }
+ toWorkDetailPage = (_courseId, _workId, _studentWorkId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ const studentWorkId = _courseId.studentWorkId
+ window.open(`/courses/${courseId}/${secondName}/${_workId || workId}/${_studentWorkId || studentWorkId}/appraise`);
+ } else {
+ window.open(`/courses/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`);
+ }
+ }
+ toNewPage = (courseId) => {
+ const secondName = this.getModuleName()
+ this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
+ }
+ toListPage = (_courseId, _workId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}${_workId ? '/' + _workId : ''}`)
+ }
+ }
+
+
+ toWorkPostPage = (_courseId, _workId, isEdit, _studentWorkId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ const studentWorkId = _courseId.studentWorkId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/${isEdit? `${_studentWorkId || studentWorkId}/post_edit` : 'post'}`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/${isEdit? `${_studentWorkId}/post_edit` : 'post'}`)
+ }
+ }
+ toWorkListPage = (_courseId, _workId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/list`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/list`)
+ }
+ }
+ toWorkAnswerPage = (_courseId, _workId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/answer`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/answer`)
+ }
+ }
+
+ toWorkQuestionPage = (_courseId, _workId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _workId || _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/question`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/question`)
+ }
+ }
+
+ toWorkSettingPage = (_courseId, _workId) => {
+ const secondName = this.getModuleName()
+ if (typeof _courseId == "object") {
+ const workId = _courseId.workId
+ const courseId = _courseId.coursesId
+ this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/setting`)
+ } else {
+ this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/setting`)
+ }
+ }
+
+
+
+ render() {
+ const { snackbarOpen} = this.state;
+ return (
+
+
+
+
+
+ )
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 57f574ac4..fa3a29542 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -823,6 +823,7 @@ class Studentshavecompletedthelist extends Component {
--
:
{record.operating}
}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index f3495f7e4..6add102ae 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -864,7 +864,7 @@ class GraduationTaskssettinglist extends Component{
{
tag.name &&
调整学生最终成绩
其它历史评分将全部失效:""}>
- {tag.name==="评阅"?
+ {tag.name==="评阅"?
{tag.name}
:
diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
index 59e8b924c..cc1a94bc0 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
@@ -228,7 +228,7 @@ class PollDetailTabFirst extends Component{
width:120,
render:(operation,item,index)=>{
return(
- item.status == 1 ? 查看:--
+ item.status == 1 ? 查看:--
)
}
}];