diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index c044c1711..10d71afe4 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -235,15 +235,17 @@ class GraduationTasks extends Component{
this.setState({
Modalstype:true,
- Modalstopval:"公开后非课堂成员也可以访问查看",
- ModalsBottomval:"是否确认公开？",
+ Modalstopval:"设为公开后，非课堂成员也可以访问查看",
+ ModalsBottomval:"是否确认设为公开？",
ModalCancel:this.cancelmodel,
ModalSave:this.saveonOpen,
})
}
- // onSticky = (message) => {
+
+
+ // onSticky = (message) => {
// const cid = this.props.match.params.coursesId
// const url = `/messages/${message.id}/sticky_top.json`
// axios.put(url, {
diff --git a/public/react/src/modules/courses/shixunHomework/Homeworddescription.js b/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
index a6e1351e0..405490f38 100644
--- a/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
+++ b/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
@@ -1,114 +1,114 @@
-import React, {Component} from "react";
-import {
- Form,
- Select,
- Input,
- Button,
- Checkbox,
- Upload,
- Icon,
- message,
- Modal,
- Table,
- Divider,
- InputNumber,
- Tag,
- DatePicker,
- Radio,
- Tooltip,
- notification
-} from "antd";
-import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
-import {Link, Switch, Route, Redirect} from 'react-router-dom';
-import axios from 'axios';
-import '../css/members.css'
-import "../common/formCommon.css"
-import '../css/Courses.css'
-import '../css/members.css'
-import "../common/formCommon.css"
-import '../css/Courses.css'
-import moment from 'moment';
-import '../css/members.css'
-import "../common/formCommon.css"
-import './style.css'
-import Workquestionandanswer from "./Workquestionandanswer";
-const { TextArea } = Input;
-
-
-class Homeworddescription extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
- props: props,
- description:undefined,
- }
-
-
- }
-
- componentDidMount() {
-
-
- }
- //取消操作
- clickcancel =()=>{
- this.props.NOReleaseNotes();
- }
- //确认操作
- onSaveExercise=()=>{
- if(this.state.description === "" || this.state.description===undefined || this.state.description === null){
- this.props.showNotification("请输入作业说明");
- return
- }
- this.props.ReleaseNotes(this.state.description);
- }
- //获取输入框
- settextarea=(e)=>{
- this.setState({
- description:e
- })
- }
- render() {
- return (
-
-
-
-
- {/**/}
- {/**/}
-
-
-
-
-
-
-
-
-
-
- )
- }
-
-
-
-
-
-
-}
-const Homeworddescriptions = Form.create({name: 'taskPollNew'})(Homeworddescription);
+import React, {Component} from "react";
+import {
+ Form,
+ Select,
+ Input,
+ Button,
+ Checkbox,
+ Upload,
+ Icon,
+ message,
+ Modal,
+ Table,
+ Divider,
+ InputNumber,
+ Tag,
+ DatePicker,
+ Radio,
+ Tooltip,
+ notification
+} from "antd";
+import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
+import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import axios from 'axios';
+import '../css/members.css'
+import "../common/formCommon.css"
+import '../css/Courses.css'
+import '../css/members.css'
+import "../common/formCommon.css"
+import '../css/Courses.css'
+import moment from 'moment';
+import '../css/members.css'
+import "../common/formCommon.css"
+import './style.css'
+import Workquestionandanswer from "./Workquestionandanswer";
+const { TextArea } = Input;
+
+
+class Homeworddescription extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ props: props,
+ description:undefined,
+ }
+
+
+ }
+
+ componentDidMount() {
+
+
+ }
+ //取消操作
+ clickcancel =()=>{
+ this.props.NOReleaseNotes();
+ }
+ //确认操作
+ onSaveExercise=()=>{
+ if(this.state.description === "" || this.state.description===undefined || this.state.description === null){
+ this.props.showNotification("请输入作业说明");
+ return
+ }
+ this.props.ReleaseNotes(this.state.description);
+ }
+ //获取输入框
+ settextarea=(e)=>{
+ this.setState({
+ description:e
+ })
+ }
+ render() {
+ return (
+
+
+
+
+ {/**/}
+ {/**/}
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+
+
+
+
+
+
+}
+const Homeworddescriptions = Form.create({name: 'taskPollNew'})(Homeworddescription);
export default Homeworddescriptions;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 6d19b13ef..98ba43e55 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -75,7 +75,7 @@ class Listofworks extends Component {
teacherlist: undefined,
searchtext: "",
course_groupysls: undefined,
- course_groupyslstwo: undefined,
+ course_groupyslstwo: [],
visible: false,
userid: 0,
course_group: null,
@@ -1164,7 +1164,7 @@ class Listofworks extends Component {
// console.log(checkedValues);
this.setState({
unlimited: 0,
- course_groupyslstwo: undefined,
+ course_groupyslstwo: [],
loadingstate: true,
})
@@ -1172,7 +1172,7 @@ class Listofworks extends Component {
} else if (checkedValues.length === data.length) {
this.setState({
unlimited: 0,
- course_groupyslstwo: undefined,
+ course_groupyslstwo: [],
loadingstate: true,
})
this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
@@ -1198,6 +1198,7 @@ class Listofworks extends Component {
this.setState({
unlimitedtwo: 1,
course_groupysls: undefined,
+ checkedValuesineinfo:[],
loadingstate: true,
})
@@ -1206,6 +1207,7 @@ class Listofworks extends Component {
this.setState({
unlimitedtwo: 1,
course_groupysls: undefined,
+ checkedValuesineinfo:[],
loadingstate: true,
})
this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, this.state.page, this.state.limit);
@@ -1485,22 +1487,22 @@ class Listofworks extends Component {
notlimiteds = () => {
this.setState({
checkedValuesine: undefined,
- course_groupyslstwo: undefined,
+ course_groupyslstwo: [],
unlimited: 0,
loadingstate: true,
})
- this.Startsorting(this.state.order, null, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+ this.Startsorting(this.state.order, [], this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
}
notlimitedst = () => {
// console.log(this.state.course_group_info);
this.setState({
unlimitedtwo: 1,
- checkedValuesineinfo: undefined,
+ checkedValuesineinfo: [],
course_groupysls: undefined,
loadingstate: true,
})
- this.Startsorting(this.state.order, this.state.course_groupyslstwo, undefined, this.state.searchtext, this.state.page, this.state.limit);
+ this.Startsorting(this.state.order, this.state.course_groupyslstwo, [], this.state.searchtext, this.state.page, this.state.limit);
}
//立即截止确定按钮
coursetaskend = () => {
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 272ac6418..a21d6f977 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -334,7 +334,7 @@ class ShixunhomeWorkItem extends Component{
{discussMessage.commit_count===undefined?"":
{discussMessage.commit_count} 已交}
{discussMessage.uncommit_count===undefined?"":
{discussMessage.uncommit_count} 未交}
{/*
{discussMessage.replies_count} 3 未评*/}
-
0?"剩余时间":""} placement="bottom">
+
{discussMessage.status_time}
@@ -349,7 +349,7 @@ class ShixunhomeWorkItem extends Component{
{this.props.isAdmin?:""}
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 7ebbeb473..438babfea 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -429,27 +429,36 @@ class Workquestionandanswer extends Component {
{jobsettingsdata === undefined|| jobsettingsdata.data.description===null? "无" :
+
{/* /!*{jobsettingsdata.data.description}*!/*/}
- {/* */}
+ {/* */}
- {/* */}
- {/*
*/}
- {/* /!*{ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?""*!/*/}
- {/* */}
- {/* /!*}*!/*/}
- {/*
*/}
-
- {/*
*/}
+ {/*
*/}
+ {/* /!*{ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?""*!/*/}
+ {/* */}
+ {/* /!*}*!/*/}
+ {/*
*/}
+
+ {/*