![]({getImageUrl("images/educoder/nodata.png")}/)
+
+ ![]({getUrl("images/educoder/nodata.png")}/)
暂时还没有相关数据哦！
+
+
暂时还没有相关数据哦！
-
-
+
![]({setImagesUrl("images/educoder/tag2.png")}/)
-
+
{
item.is_pdf && item.is_pdf == true ?
- {item.title}
+
- { + {/* { topicInfo.attachment_list.map((item,key)=>{ return( +
+
-
点击或拖拽文件到这里上传
-- 单个文件最大150MB -
-
+
点击或拖拽文件到这里上传
++ 单个文件最大150MB +
+实训已经更新了，正在为您重置!
-本实训的开启时间：{shixunsmessage}
开启时间之前不能挑战
-
*/} - {/*知道了*/} - {/*
*/} -实训已经更新了，正在为您重置!
+本实训的开启时间：{shixunsmessage}
开启时间之前不能挑战
+
*/} + {/*知道了*/} + {/*
*/} +还未上传附件
- : + : "" } {this.state.updatas===true?请上传附件:""}还未上传附件
- : + : "" } {this.state.updatas===true?请上传附件:""}
-
-
-
- {this.props.coursedata.name}
+ {this.props.coursedata.name}
>
- 试卷
+ 试卷
>
{/*!question_id ? '新建' : '编辑'*/}
- {qNameArray[question_type]}
- （客观题，由系统自动评分，允许手动调分，请设置标准答案 ；支持最多5个空，每空得分按照本题的总分平均计算）
-
- {/* {!question_id ? '新建' : '编辑'} */}
- 选择题
- （客观题，由系统自动评分，请设置标准答案）
-
+
公告栏
{
this.props.isAdmin()===true?
- 暂时还没有相关数据哦！ 暂时还没有相关数据哦！
{tableData && tableData.graduation_topic_name}
{topicId==undefined?"新建":"编辑"}毕设选题
-
diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
index ab93b5bc5..41bc5bac4 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
@@ -93,10 +93,12 @@ class SingleEditor extends Component{
question_choices,
standard_answers: answerArray,
insert_id: question_id_to_insert_after || undefined
- })
- .then((response) => {
+ }).then((response) => {
if (response.data.status == 0) {
this.props.addSuccess()
+ }else if(response.data.status == 3){
+ // 已发布试卷编辑保存
+ this.props.changeScore(question_id,answerArray);
}
})
.catch(function (error) {
diff --git a/public/react/src/modules/courses/exercise/new/NullEditor.js b/public/react/src/modules/courses/exercise/new/NullEditor.js
deleted file mode 100644
index dca67032f..000000000
--- a/public/react/src/modules/courses/exercise/new/NullEditor.js
+++ /dev/null
@@ -1,361 +0,0 @@
-import React,{ Component } from "react";
-
-import {
- Form, Input, InputNumber, Switch, Radio,
- Slider, Button, Upload, Icon, Rate, Checkbox, message,
- Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
-import update from 'immutability-helper'
-import { qNameArray } from './common'
-import NullMDEditor from './NullMDEditor'
-import NullChildEditor from './NullChildEditor'
-import {getUrl, ActionBtn, DMDEditor} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-
-class NullEditor extends Component{
- constructor(props){
- super(props);
- /**
- choice_id: 32076
- choice_position: 1
- choice_text: "1"
- standard_boolean: true
- standard_answer: [{choice_id: 1, answer_text: ["2", "22"]}]
-
- */
- const {question_choices, standard_answer} = this.props;
- let _standard_answers = undefined;
- if (standard_answer) {
- _standard_answers = []
-
- standard_answer.forEach((answers, index) => {
- _standard_answers.push([])
- answers.answer_text.forEach((item, itemIndex) => {
- _standard_answers[index].push(item)
- })
-
- })
- }
- this.state = {
- standard_answers: _standard_answers || [],
- question_title: this.props.question_title || '',
- question_type: this.props.question_type || 3,
- question_score: this.props.question_score || this.props.init_question_score,
- is_ordered: !!this.props.is_ordered,
- }
- }
- on_is_ordered_change = (e) => {
- this.setState({ is_ordered: e.target.checked})
-
- }
-
- onSave = () => {
- const {question_title, question_score, question_type, question_choices, standard_answers, is_ordered } = this.state;
- const { question_id_to_insert_after, question_id } = this.props
-
- let newis_ordered= is_ordered;
-
- if(newis_ordered===true){
- if(standard_answers.length===1){
- newis_ordered=false
- }
- }
- // TODO check
- // const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
- let answerArray = []
- if(!question_title) {
- this.refs['titleEditor'].showError()
- this.props.showNotification('题目：不能为空'); return;
-
- }
- const intScore = parseFloat(question_score)
- if (intScore == 0) {
- this.props.showNotification('分值：必须大于0'); return;
- } else if(!question_score || intScore == NaN) {
- this.props.showNotification('分值：不能为空'); return;
- }
-
-
- let isEmpty = false;
- standard_answers.forEach((answers, index) => {
- answerArray.push({
- "choice_id": index + 1,
- "answer_text":[]
- })
- answers.forEach((item, itemIndex) => {
- answerArray[index].answer_text.push(item)
- if(!item) {
- this.refs[`nullChildEditor${index}`].showError(itemIndex)
- // this.props.showNotification(`请先输入第${index+1}个填空的第${itemIndex+1}参考答案。`);
- this.props.showNotification(`答案：不能为空`);
- isEmpty = true;
- }
- })
- })
- if (isEmpty == true) {
- return;
- }
- if(!question_title) {
- this.refs['titleEditor'].showError()
- this.props.showNotification('题目：不能为空'); return;
-
- }
-
- /**
- {
- "question_title":"社会主义核心价值观(),(),()...",
- "question_type":3,
- "question_score":5,
- "standard_answers":[
- {"choice_id":1,
- "answer_text":["abbc","xxx","sssss"]
- },
- {"choice_id":2,
- "answer_text":["abbc","xxx","sssss"]
- }
- ]
- "is_ordered":true
-}
- }*/
- const Id = this.props.match.params.Id
- if (question_id) {
- const editUrl = `/exercise_questions/${question_id}.json`
- axios.put(editUrl, {
- question_title,
- question_type: 3,
- question_score,
- question_choices,
- standard_answers: answerArray,
- insert_id: question_id_to_insert_after || undefined,
- is_ordered:newis_ordered,
- })
- .then((response) => {
- if (response.data.status == 0) {
- this.props.addSuccess()
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- } else {
- const url = `/exercises/${Id}/exercise_questions.json`
-
- axios.post(url, {
- question_title,
- question_type: 3,
- question_score,
- question_choices,
- standard_answers: answerArray,
- insert_id: question_id_to_insert_after || undefined,
- is_ordered:newis_ordered,
- })
- .then((response) => {
- if (response.data.status == 0) {
- this.props.addSuccess()
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- }
- onCancel = () => {
- this.props.onEditorCancel()
- }
- componentDidMount = () => {
-
- }
- on_question_score_change = (e) => {
- this.setState({ question_score: e })
- }
-
-
- // placeholderCountInRange 被删除的个数
- onPlaceholderChange = (placeholderCountBefore, placeholderCountInRange, totalPlaceholderCount) => {
- const { standard_answers } = this.state;
- const new_standard_answers = standard_answers.slice()
- if (placeholderCountInRange) {
- new_standard_answers.splice(placeholderCountBefore, placeholderCountInRange)
- }
- if (totalPlaceholderCount) {
- for(let i = 0; i < totalPlaceholderCount; i++) {
- new_standard_answers.splice(placeholderCountBefore + i, 0, [""])
- }
- }
- this.setState({ standard_answers: new_standard_answers }, () => {
- if (this.mdReactObject) {
- this.mdReactObject.toShowMode()
- }
- })
-
- }
-
- onAnswerChange = (index, itemIndex, val) => {
- if (this.state.standard_answers[index]) {
- this.setState(
- (prevState) => ({
- standard_answers : update(prevState.standard_answers
- , {[index]: {$splice: [[itemIndex, 1, val]]}}),
- })
- )
- }
- }
- addChildAnswer = (index) => {
- this.setState(
- (prevState) => ({
- standard_answers : update(prevState.standard_answers
- , {[index]: {$push: ['']}}),
- })
- )
- }
-
- deleteChildAnswer = (index, childIndex) => {
- if(!this.state.standard_answers[index][childIndex]) {
- this.setState(
- (prevState) => ({
- standard_answers : update(prevState.standard_answers,
- {[index]:
- {$splice: [[childIndex, 1]]}
- }
- )
- })
- )
- return;
- }
- this.props.confirm({
- content: `确认要删除这个参考答案吗？`,
- onOk: () => {
- this.setState(
- (prevState) => ({
- standard_answers : update(prevState.standard_answers,
- {[index]:
- {$splice: [[childIndex, 1]]}
- }
- )
- })
- )
-
- }
- })
-
- }
-
- toMDMode = (that) => {
- if (this.mdReactObject) {
- let mdReactObject = this.mdReactObject;
- this.mdReactObject = null
- if (that != mdReactObject) {
- mdReactObject.toShowMode()
- }
- }
- this.mdReactObject = that;
- }
-
- render() {
- let { question_title, question_score, question_type, question_choices, standard_answers
- , is_ordered } = this.state;
- let { question_id, index, exerciseIsPublish,
- // question_title,
- // question_type,
- // question_score,
- isNew } = this.props;
-
- // const { getFieldDecorator } = this.props.form;
-
- const isAdmin = this.props.isAdmin()
- const courseId=this.props.match.params.coursesId;
- const isEdit = !!this.props.question_id
- const qNumber = `question_${index}`;
-
- // console.log(this.state.showtype)
- // const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
- return(
-
-
-
- )
- }
-}
-// RouteHOC()
-export default (NullEditor);
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js
deleted file mode 100644
index b979b62c1..000000000
--- a/public/react/src/modules/courses/exercise/new/SingleEditor.js
+++ /dev/null
@@ -1,320 +0,0 @@
-import React,{ Component } from "react";
-
-import {
- Form, Input, InputNumber, Switch, Radio,
- Slider, Button, Upload, Icon, Rate, Checkbox, message,
- Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
-import update from 'immutability-helper'
-
-import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-
-const tagArray = [
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
- 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
- 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
-class SingleEditor extends Component{
- constructor(props){
- super(props);
- /**
- choice_id: 32076
- choice_position: 1
- choice_text: "1"
- standard_boolean: true
- */
- const {question_choices} = this.props;
- let _standard_answers = undefined;
- let _question_choices = undefined;
- if (question_choices) {
- _standard_answers = []
- _question_choices = []
-
- question_choices.forEach((item, index) => {
- _standard_answers.push(item.standard_boolean)
- _question_choices.push(item.choice_text)
- })
- }
- this.state = {
- question_choices: _question_choices || ['', '', '', ''],
- standard_answers: _standard_answers || [false, false, false, false],
- question_title: this.props.question_title || '',
- question_type: this.props.question_type || 0,
- question_score: this.props.question_score || this.props.init_question_score,
- }
- }
- addOption = () => {
- const { question_choices, standard_answers } = this.state;
- question_choices.push('')
- standard_answers.push(false)
- this.setState({ question_choices, standard_answers })
- }
- deleteOption = (index) => {
- let {question_choices}=this.state;
- if(question_choices[index]===""){
- // repeat code
- this.toMDMode(null)
- this.setState(
- (prevState) => ({
- question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
- standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
- })
- )
- }else{
- this.props.confirm({
- content: `确认要删除这个选项吗？`,
- onOk: () => {
- this.toMDMode(null)
- this.setState(
- (prevState) => ({
- question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
- standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
- })
- )
- }
- })
- }
- }
- onSave = () => {
- const {question_title, question_score, question_type, question_choices, standard_answers } = this.state;
- const { question_id_to_insert_after, question_id } = this.props
- // TODO check
- const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
- if(!question_title) {
- this.refs['titleEditor'].showError()
- this.props.showNotification('题目：不能为空'); return;
-
-
- }
-
- const intScore = parseFloat(question_score)
- if (intScore == 0) {
- this.props.showNotification('分值：必须大于0'); return;
- } else if(!question_score || intScore == NaN) {
- this.props.showNotification('分值：不能为空'); return;
- }
- if(!answerArray || answerArray.length == 0) {
- this.props.showNotification('请先点击选择本选择题的正确选项'); return;
- }
- if(!question_title) {
- this.refs['titleEditor'].showError()
- this.props.showNotification('题目：不能为空'); return;
-
-
- }
-
- for(let i = 0; i < question_choices.length; i++) {
- if (!question_choices[i]) {
- this.refs[`optionEditor${i}`].showError()
- this.props.showNotification(`请先输入 ${tagArray[i]} 选项的内容`); return;
- }
- }
-
- /**
- {
- "question_title":"同学朋友间常用的沟通工具是什么？",
- "question_type":1,
- "question_score":5,
- "question_choices":["a答案","b答案","c答案","d答案"],
- "standard_answers":[1]
- }*/
- const Id = this.props.match.params.Id
- if (question_id) {
- const editUrl = `/exercise_questions/${question_id}.json`
- axios.put(editUrl, {
- question_title,
- question_type: answerArray.length > 1 ? 1 : 0,
- question_score,
- question_choices,
- standard_answers: answerArray,
- insert_id: question_id_to_insert_after || undefined
- })
- .then((response) => {
- if (response.data.status == 0) {
- this.props.addSuccess()
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- } else {
- const url = `/exercises/${Id}/exercise_questions.json`
-
- axios.post(url, {
- question_title,
- question_type: answerArray.length > 1 ? 1 : 0,
- question_score,
- question_choices,
- standard_answers: answerArray,
- insert_id: question_id_to_insert_after || undefined
- })
- .then((response) => {
- if (response.data.status == 0) {
- this.props.addSuccess()
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- }
- onCancel = () => {
- this.props.onEditorCancel()
- }
- componentDidMount = () => {
-
- }
- onOptionClick = (index) => {
- // if (this.props.exerciseIsPublish) {
- // return;
- // }
- let standard_answers = this.state.standard_answers.slice(0)
- standard_answers[index] = !standard_answers[index]
- this.setState({ standard_answers })
- }
- onOptionContentChange = (value, index) => {
- let question_choices = this.state.question_choices.slice(0);
- question_choices[index] = value;
- this.setState({ question_choices })
- }
- on_question_score_change = (e) => {
- this.setState({ question_score: e })
- }
- toMDMode = (that) => {
- if (this.mdReactObject) {
- let mdReactObject = this.mdReactObject;
- this.mdReactObject = null
- mdReactObject.toShowMode()
- }
- this.mdReactObject = that;
-
- }
- toShowMode = () => {
-
- }
- render() {
- let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
- let { question_id, index, exerciseIsPublish,
- // question_title,
- // question_type,
- // question_score,
- isNew } = this.props;
-
- // const { getFieldDecorator } = this.props.form;
-
- const isAdmin = this.props.isAdmin()
- const courseId=this.props.match.params.coursesId;
- const isEdit = !!this.props.question_id
- const qNumber = `question_${index}`;
- // TODO show模式 isNew为false isEdit为false
-
- // [true, false, true] -> [0, 2]
-
- const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
- return(
-
- {
- standard_answers.map((answers, index) => {
-
- return
-
-
- {standard_answers.length>1?
-
-
-
- 分值：
-
-
-
-
-
- )
- }
-}
-// RouteHOC()
-export default (SingleEditor);
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/question/shixunAnswer.js b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
index d8644f8c4..cdffe08b8 100644
--- a/public/react/src/modules/courses/exercise/question/shixunAnswer.js
+++ b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
@@ -316,7 +316,7 @@ class shixunAnswer extends Component{
第{item[0].position}关
-
+
{item[0].name}
diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
new file mode 100644
index 000000000..c7f773190
--- /dev/null
+++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -0,0 +1,330 @@
+import React,{ Component } from "react";
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
+import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import './myysleduinforms.css'
+import axios from 'axios';
+import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
+import moment from "../new/CoursesNew";
+import Fileslistitem from "../Resource/Fileslistitem";
+// 公告栏
+class Bullsubdirectory extends Component{
+ constructor(props){
+ super(props);
+ this.messageRef = React.createRef();
+
+ this.state={
+ description:null,
+ isSpinysl:false,
+ whethertoeditysl:false,
+ addonAfter:0,
+ eduintits:"",
+ informs:[],
+
+
+ }
+ }
+
+ componentDidMount() {
+ console.log("获取到数据");
+ console.log(this.props);
+ let{id,myname,mydescription} =this.props
+ this.props.form.setFieldsValue({
+ id:id,
+ eduintits:myname,
+ description:mydescription,
+ });
+ this.setState({
+ id:id,
+ eduintits:myname,
+ description:mydescription,
+
+ })
+ if(myname!=undefined){
+ this.setState({
+ addonAfter:myname.length
+ })
+ }
+
+ }
+
+
+ bianji = (bians)=>{
+ this.setState({
+ whethertoeditysl:bians,
+ })
+ if(bians===true){
+ this.props.getyslbooltrue();
+ }else {
+ this.props.getyslboolfalse();
+ }
+ };
+ changeTopicName = (e) => {
+ console.log("调用了changeTopicName");
+ let num = e.target.value.length;
+
+ if(num>60){
+ return;
+ }
+ this.setState({
+ addonAfter: num < 0 ? 0 : num
+ });
+ if(num<=60){
+ this.setState({
+ eduintits: e.target.value
+ })
+
+ this.props.form.setFieldsValue({
+ eduintits: e.target.value,
+ });
+ }
+
+
+ }
+ handleSubmit=(e) => {
+ e.preventDefault();
+ this.props.form.validateFields((err, values) => {
+ if (!err) {
+ console.log(values.description);
+ if(values.eduintits === undefined|| values.eduintits === "" || values.eduintits ===null){
+ this.props.showNotification(`请输入标题`);
+ return
+
+ }
+ if(values.description === undefined|| values.description === "" || values.description ===null){
+ this.props.showNotification(`请输入内容`);
+ return
+
+ }
+ var id=this.props.match.params.coursesId
+ var titname="";
+ try {
+ if(values.eduintits.length>0){
+ if( values.eduintits.length>60){
+ var str=values.eduintits;
+ titname=str.substring(0,60);
+ }else {
+ titname=values.eduintits;
+ }
+ }else {
+ titname=values.eduintits;
+ }
+ }catch (e) {
+ titname=values.eduintits;
+ }
+ var url = `/courses/${id}/update_informs.json`;
+ axios.post(url,{
+ inform_id:this.state.id,
+ name:titname,
+ description:values.description,
+ }).then((result) => {
+ if(result){
+ if(result.data){
+ if(result.data.status === 0){
+ this.props.form.setFieldsValue({
+ id:this.state.id,
+ eduintits:titname,
+ description:values.description,
+ });
+ this.setState({
+ whethertoeditysl:false,
+ id:this.state.id,
+ eduintits:titname,
+ description:values.description,
+ });
+ this.props.getinputdata();
+ this.props.getyslboolfalse();
+ this.props.showNotification(result.data.message);
+ }else {
+ this.props.showNotification(result.data.message);
+
+ }
+ }
+
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }else{
+ console.log(err);
+ }
+
+ });
+ }
+
+
+ render(){
+ let{description,whethertoeditysl,addonAfter,eduintits,informs,isSpinysl} =this.state;
+ let{myname,mydescription}=this.props;
+ const {getFieldDecorator} = this.props.form;
+
+ return(
+
- {/* 点击设置答案 */}
- {/* TODO 加了tooltip后，会丢失掉span的class */}
- {/*
- }) }
-
- {tagArray[index]}
-
-
- {exerciseIsPublish || index===0?
-
- :
- {/* {!exerciseIsPublish &&
-
-
- 分值：
-
-
-
+
+
+ {
+ whethertoeditysl === false?
+
+
+
+ :
+
+
+
+
+
+ {myname}
+ {
+ this.props.isAdmin() === true ?
+ (this.props.yslbool===false?
+ this.bianji(true)}>
+ :
+ ""
+ )
+
+ :""
+ }
+
+
+
+
+ }
+
-
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index e679702da..7e5707695 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -771,7 +771,10 @@ class GraduationTaskssettingapp extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ // this.props.history.replace(this.props.current_user.first_category_url);
+ this.props.history.replace(`/courses/${this.state.settingdata.course_id}/graduation_tasks/${this.state.settingdata.graduation_id}`);
+
}
isgoback=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 816d53526..9718de28a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -64,9 +64,10 @@ class GraduationTaskssettinglist extends Component{
// if(courseId===undefined){
// this.props.history.push("/courses");
// }else{
- // this.props.history.push(this.props.current_user.first_category_url);
+ // this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.taskslistdata.course_id}/graduation_tasks/${this.state.taskslistdata.graduation_id}`);
}
seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index 22ce6fa04..b8296f9ef 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -62,7 +62,8 @@ class GraduationTasksquestions extends Component{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
}
end=()=>{
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index b24277a2c..b518c44f3 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -114,7 +114,7 @@ class GraduateTopicDetail extends Component{
{
- whethertoedit === false?
-
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 1d3c7578f..7c499430a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -19,7 +19,7 @@ class GraduationTasksnew extends Component {
this.state = {
coursename: "",
coursesearch: "",
- title_num: 60,
+ title_num: 0,
title_value: "",
fileList: [],
contents: [{val: "", id: 1}],
@@ -113,15 +113,16 @@ class GraduationTasksnew extends Component {
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.props.match.params.coursesId}/graduation_tasks/${this.props.match.params.category_id}`);
}
// 输入title
changeTitle = (e) => {
-
+ // title_num: 60 - parseInt(e.target.value.length),
this.setState({
- title_num: 60 - parseInt(e.target.value.length),
+ title_num: e.target.value.length,
title_value: e.target.value
})
@@ -384,7 +385,7 @@ class GraduationTasksnew extends Component {
rules: [{required: true, message: "不能为空"}],
})()}
+ suffix={String(title_num)+"/60"}/>)}
- {
- description === null || description=== undefined ||description === "" ?
-
@@ -257,3 +428,7 @@ class Eduinforms extends Component{
}
const Eduinformss = Form.create({ name: 'eduinforms' })(Eduinforms);
export default Eduinformss;
+{/*
-
- :
-
- ![]({getImageUrl("images/educoder/nodata.png")})
-
-
- :
-
+ whethertoedit === false?""
+ :
+
- }
-
-
-
+
}
+
+ {
+ informs === null || informs=== undefined ||informs.length === 0 ?
+
+
+
+
+ :
+
+
+
+
+ { informs&&informs.map((item, index) => {
+ return (
+
+ }
+ */}
+{/* {item.name===""?"":item.name===undefined?"":item.name===null?"":*/}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/gradinforms/myysleduinforms.css b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
index f3fa2fb1a..1e86607ec 100644
--- a/public/react/src/modules/courses/gradinforms/myysleduinforms.css
+++ b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
@@ -1,5 +1,5 @@
.yslmt16px{
- padding-top: 25px !important;
+ padding-top: 12px !important;
padding-left: 25px !important;
padding-right: 25px !important;
padding-bottom: 1px !important;
@@ -10,4 +10,72 @@
padding: 25px !important;
-}
\ No newline at end of file
+}
+
+.bluebkbk{
+ border: 1px solid #4CADFF;
+ width: 79px;
+ height: 30px;
+ text-align: center;
+ line-height: 30px;
+ border-radius: 2px;
+}
+.ysleduinwh{
+
+ padding-right: 25px;
+ margin-top: 26px;
+ display: flex;
+ justify-content:flex-start;
+}
+.yslduincolorred{
+ color: red;
+ line-height: 40px;
+ height: 40px;
+ text-align: center;
+}
+.yslduinleft{
+ width: 100% ;
+}
+.yslduinlefts{
+ width: 25px;
+ line-height: 40px;
+ height: 40px;
+ text-align: center;
+}
+.mtyslduin25{
+ margin-top: 25px;
+}
+
+.newbianji1{
+ font-size: 16px !important;
+ margin-right: 10px;
+ color: #4CACFF;
+ margin-bottom: 3px;
+ display: inline-block;
+}
+
+.ysltitbt{
+ float: left;
+ padding-top: 31px;
+ padding-left: 25px;
+ font-size: 16px;
+ color: #333333;
+ text-align: left;
+}
+.markdownysltext{
+ font-size: 14px;
+ color: #999999;
+}
+.fudonyingxiangysl{
+ width: 100%;
+ height: 66px;
+}
+.yslbianji{
+ padding-top: 31px;
+}
+.yslmaxheigth80{
+ max-height: 80px;
+}
+.ysldashed{
+ border:1px dashed #EEE;
+}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index fcbe6b9aa..ce704ef6e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -77,16 +77,6 @@ class GraduationTasksSubmitedit extends Component{
}
- setedit=()=>{
- // let coursesId=this.props.match.params.coursesId;
- // let workId=this.props.match.params.work_Id;
- // let {workslist}=this.state
- // let task_id=workslist&&workslist.task_id;
- // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit";
- this.goback()
- }
-
-
handleSelectChange = (value) => {
console.log(value);
@@ -103,7 +93,8 @@ class GraduationTasksSubmitedit extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
+
}
@@ -378,6 +369,9 @@ class GraduationTasksSubmitedit extends Component{
}
Commoninterface =(fileList,selectmemberslist,workslist)=>{
+ let coursesIds=this.props.match.params.coursesId
+ let workId=this.props.match.params.work_Id;
+
let userids=[];
for(var list of selectmemberslist){
@@ -424,7 +418,7 @@ class GraduationTasksSubmitedit extends Component{
this.setState({
spinnings:true
})
- let workId=this.props.match.params.work_Id;
+
// if(fileList.length===0){
// this.setState({
@@ -444,8 +438,8 @@ class GraduationTasksSubmitedit extends Component{
spinnings:false
})
if(response!== undefined){
- this.setedit()
-
+ // this.goback()
+ window.location.href=`/courses/${coursesIds}/graduation_tasks/${workId}/appraise`
}
// if(response.status===200) {
// GraduationTasksnewtype=false;
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index dadc621b2..3c8318796 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -105,7 +105,7 @@ class GraduationTasksSubmitnew extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
}
@@ -361,9 +361,7 @@ class GraduationTasksSubmitnew extends Component{
return false;
}
}
- gocannel=()=>{
- this.props.history.goBack()
- }
+
//公用数据
Commoninterface = (fileList,selectmemberslist,workslist)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index d01be4676..c03ffc1e0 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -76,7 +76,9 @@ class GraduationTasksappraise extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+
+ this.props.history.replace(`/courses/${this.state.datalist.course_id}/graduation_tasks/${this.state.datalist.graduation_id}/${this.state.datalist.task_id}/list`);
+
}
Cancelvisible=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 559144ecf..42a128719 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -18,7 +18,7 @@ class GraduationTasksedit extends Component{
this.state={
coursename:"",
coursesearch:"",
- title_num:60,
+ title_num:0,
title_value:"",
fileList: [],
contents: [{val:"",id:1}],
@@ -53,14 +53,14 @@ class GraduationTasksedit extends Component{
//
// }
let namelength=result.data.task_name.length;
- let sixlength=title_num-namelength
+ // let sixlength=title_num-namelength
this.setState({
// fileList:newfilelist,
description:result.data.description,
tasktype:result.data.task_type,
name:result.data.task_name,
data:result.data,
- title_num:sixlength,
+ title_num:namelength,
attachments:result.data.attachments,
})
@@ -88,15 +88,15 @@ class GraduationTasksedit extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.data.course_id}/graduation_tasks/${this.state.data.graduation_id}`);
}
// 输入title
changeTitle=(e)=>{
-
+ // title_num:60-parseInt(e.target.value.length),
this.setState({
- title_num:60-parseInt(e.target.value.length),
+ title_num:e.target.value.length,
title_value:e.target.value
})
@@ -379,7 +379,7 @@ class GraduationTasksedit extends Component{
{item.name}}*/}
+{/* */}
+{/*
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index 8c46bfa0e..3845721be 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -12,6 +12,8 @@ import "../../common/formCommon.css"
import '../style.css'
import '../../css/Courses.css'
import { WordsBtn, City } from 'educoder'
+
+import {Link} from 'react-router-dom'
// import City from './City'
// import './board.css'
@@ -20,6 +22,7 @@ import { WordsBtn, City } from 'educoder'
const confirm = Modal.confirm;
const $ = window.$
const { Option } = Select;
+const NAME_COUNT=60;
// 新建毕设选题
// https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=c6d9b36f-7701-4035-afdb-62404681108c
class GraduateTopicNew extends Component{
@@ -38,7 +41,7 @@ class GraduateTopicNew extends Component{
topic_source:[],
topic_type:[],
attachments:undefined,
- addonAfter:60,
+ addonAfter:0,
left_banner_id:undefined,
course_name:undefined
}
@@ -99,7 +102,7 @@ class GraduateTopicNew extends Component{
topic_source:result.data.topic_source,
topic_type:result.data.topic_type,
attachments:result.data.attachments,
- addonAfter:20-parseInt(result.data.selected_data.name.length)
+ addonAfter:parseInt(result.data.selected_data.name.length)
})
this.props.form.setFieldsValue({
tea_id:result.data.selected_data.tea_id,
@@ -257,9 +260,9 @@ class GraduateTopicNew extends Component{
// 附件相关 ------------ END
changeTopicName=(e)=>{
- let num= 60 - parseInt(e.target.value.length);
+ // let num= 60 - parseInt(e.target.value.length);
this.setState({
- addonAfter:num < 0 ? 0 : num
+ addonAfter:e.target.value.length
})
}
render() {
@@ -331,7 +334,7 @@ class GraduateTopicNew extends Component{
diff --git a/public/react/src/modules/courses/members/CourseGroupChooser.js b/public/react/src/modules/courses/members/CourseGroupChooser.js
index 1a03c978f..ba9c64bb1 100644
--- a/public/react/src/modules/courses/members/CourseGroupChooser.js
+++ b/public/react/src/modules/courses/members/CourseGroupChooser.js
@@ -75,6 +75,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
return(
![]({getUrl("/images/educoder/nodata.png")}/)