From a13b5ac4c8a9482bee974d25e92d22dfaa4547c5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 11:20:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/busyWork/CommonWorkList.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 773fa52fe..b31c70926 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -40,11 +40,15 @@ function getScoreTip(score, dom) { } function buildColumns(that, student_works) { let gotWorkGroup = false; + let gotProjectInfo = false; if (student_works) { student_works.forEach(item => { if (item.work_group) { gotWorkGroup = true } + if (item.project_info && item.project_info.name) { + gotProjectInfo = true; + } }) } let courseId= that.props.match.params.coursesId; @@ -136,6 +140,22 @@ function buildColumns(that, student_works) { ), }) } + if (gotProjectInfo) { + columns.push({ + width: 72, + title: '关联项目', + dataIndex: 'project_info', + key: 'project_info', + + render: (project_info, record) => ( + + {project_info && project_info.name && {project_info.name}} + + ), + }) + } columns = columns.concat([{ width: 88, title: '提交状态', From 8d1ec4a2818043c93da9c7c619bfdc66cca84ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 28 Jun 2019 13:49:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/shixunHomework/CommitSummary.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js index 64f975446..926d938eb 100644 --- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js +++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js @@ -151,7 +151,8 @@ class CommitSummary extends Component{
-
+
{getFieldDecorator('description', { rules: [{ required: true, message: '请输入帖子内容', From 9fc8778ed9ca3be1fa5ab68b5b3818f61aa29f09 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 13:56:00 +0800 Subject: [PATCH 3/7] 72 --- .../src/modules/courses/busyWork/CommonWorkList.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index b31c70926..b1a1d5553 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -150,7 +150,7 @@ function buildColumns(that, student_works) { render: (project_info, record) => ( {project_info && project_info.name && {project_info.name}} ), @@ -196,7 +196,7 @@ function buildColumns(that, student_works) { }]) if (!niPingAndIsStudent) { columns.push({ - width: 72, + width: 70, title: '教师评分', key: 'teacher_score', dataIndex: 'teacher_score', @@ -212,7 +212,7 @@ function buildColumns(that, student_works) { }) columns.push({ - width: 72, + width: 70, title: '助教评分', key: 'teaching_asistant_score', dataIndex: 'teaching_asistant_score', @@ -271,7 +271,7 @@ function buildColumns(that, student_works) { if (that.state.anonymous_appeal) { columns.push({ - width: 72, + width: 70, title: '匿评申诉', key: 'appeal_all_count', dataIndex: 'appeal_all_count', @@ -291,7 +291,7 @@ function buildColumns(that, student_works) { } if (!niPingAndIsStudent) { columns.push({ - width: 72, + width: 70, title: '最终成绩', key: 'work_score', dataIndex: 'work_score', From efb31b8222c48eeddce8c0f72e66fec0372ab8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 28 Jun 2019 14:17:32 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/graduation/tasks/GraduationTasksnew.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js index 9707f6017..560658e9e 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js @@ -55,7 +55,7 @@ class GraduationTasksnew extends Component { for (var list of fileList) { listid.push(list.response.id) } - if (GraduationTasksnewtype === true) { + // if (GraduationTasksnewtype === true) { this.props.form.validateFields((err, values) => { if (!err) { if (values.tasktype === undefined) { @@ -87,18 +87,20 @@ class GraduationTasksnew extends Component { attachment_ids: listid, } ).then((response) => { - if (response.status === 200) { - GraduationTasksnewtype = false; + // if (response.status === 200) { + // GraduationTasksnewtype = false; // this.goback(); + if(response!==undefined){ this.props.history.push("/courses/" + this.props.match.params.coursesId + "/graduation_tasks/" + this.props.match.params.category_id + "/" + response.data.task_id + "/setting"); } + // } }).catch((error) => { console.log(error) }) } }); - } + // } } @@ -392,7 +394,7 @@ class GraduationTasksnew extends Component { > {getFieldDecorator('description', { rules: [{ - required: true, message: '请输入帖子内容', + required: true, message: '请输入内容', }, { max: 5000, message: '最大限制为5000个字符', }], From d8ad34a8625d870fe11509eedbfc37c81669bf63 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 14:20:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9A=82=E6=9C=AA=E5=86=99=E8=AF=84?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/busyWork/reply/CommonWorkAppraiseReply.js | 2 ++ .../src/modules/courses/common/comments/CCommentItem.js | 2 +- .../graduation/tasks/GraduationTasksappraiseMainEditor.js | 6 +++--- .../graduation/tasks/GraduationTasksappraiseReplyChild.js | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js index c41f888ca..146511712 100644 --- a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js +++ b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js @@ -205,6 +205,7 @@ class CommonWorkAppraiseReply extends Component{ const isAdmin = this.props.isAdmin() const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1 + const isGroup = this.props.isGroup() /** isAdmin || 评阅入口：超级管理员、老师和助教显示； -》 改成admin也不显示 匿评人：匿评期间显示 @@ -276,6 +277,7 @@ class CommonWorkAppraiseReply extends Component{ showModulationtype={this.showModulationtype} addSuccess={this.addSuccess} ref={this.editorRef} totalCount={comment_scores.length} onReply={this.onReply} placeholder={"请在此输入对本作品的评语，最大限制2000个字符"} + showSameScore={isGroup} > }
{/* ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} */} diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js index e4286e456..183ef6ea5 100644 --- a/public/react/src/modules/courses/common/comments/CCommentItem.js +++ b/public/react/src/modules/courses/common/comments/CCommentItem.js @@ -329,7 +329,7 @@ class CCommentItem extends Component{
} - {!_content && {"暂未写评语"}} + {!_content && {"暂未写评语"}}
{attachments && attachments.map((attaItem, key)=>{ return( diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js index 15300c628..dc87c9272 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js @@ -26,7 +26,7 @@ class GraduationTasksappraiseMainEditor extends Component{ onSubmit = () => { const { score, same_score } = this.state let category_id= this.props.match.params.category_id; - const url = this.props.replyUrl || `/graduation_works/${category_id}/add_score.json` + const url = `/graduation_works/${category_id}/add_score.json` const attachment_ids = this.state.fileList.map(item => { return item.response ? item.response.id : item.id }) @@ -153,7 +153,7 @@ class GraduationTasksappraiseMainEditor extends Component{ } render(){ let { total_count, comments, pageCount, fileList, score, same_score, errorMessage, numberErrorMessage } = this.state - const { current_user, memo, task_type, placeholder } = this.props + const { current_user, memo, showSameScore, placeholder } = this.props const isAdmin = this.props.isAdmin() const commentUploadProp = { width: 600, @@ -205,7 +205,7 @@ class GraduationTasksappraiseMainEditor extends Component{ {this.props.title && {this.props.title}} - { task_type == 2 &&
+ { showSameScore == true &&
整组同评 (选中，则本次评阅对象指小组全部成员，否则仅评阅此成员1人 )
} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js index 345a9874d..83d42f9fc 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js @@ -76,7 +76,8 @@ class GraduationTasksappraiseReplyChild extends Component{
} {this.props.ultimate===true ? "": isAdmin && this.props.addSuccess()} + addSuccess={() => this.props.addSuccess()} + showSameScore={true} > }
From 7c2c06874a600e1cce6f44d0d4a9ae17b7788e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 28 Jun 2019 14:50:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/{edu_user => educoder}/EWM.jpg | Bin .../courses/coursesDetail/CoursesBanner.js | 2 +- .../courses/coursesPublic/AccessoryModal.js | 32 +- .../courses/coursesPublic/AccessoryModal2.js | 523 +++++++++--------- .../courses/exercise/ExerciseListItem.js | 6 +- .../graduation/tasks/GraduateTaskItem.js | 1 + .../tasks/GraduationTasksappraise.js | 1 + .../tasks/GraduationTaskssettinglist.js | 1 + public/react/src/modules/tpm/SiderBar.js | 256 ++++----- 9 files changed, 422 insertions(+), 400 deletions(-) rename public/images/{edu_user => educoder}/EWM.jpg (100%) diff --git a/public/images/edu_user/EWM.jpg b/public/images/educoder/EWM.jpg similarity index 100% rename from public/images/edu_user/EWM.jpg rename to public/images/educoder/EWM.jpg diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 3389951f5..cc3646b9d 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -458,7 +458,7 @@ class CoursesBanner extends Component { { ` .teachersbox{ - margin-right:28px !important; + margin-right:22px !important; } ` } diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js index 5baf4e0c6..26d4499aa 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js @@ -1,5 +1,5 @@ import React,{ Component } from "react"; -import { Modal,Checkbox,Upload,Button,Icon,message} from "antd"; +import { Modal,Checkbox,Upload,Button,Icon,message,notification} from "antd"; import { WordsBtn,getUrl, getUploadActionUrl} from 'educoder'; import axios from 'axios'; import Modals from '../../modals/Modals'; @@ -110,6 +110,7 @@ class AccessoryModal extends Component{ this.props.Cancel() } Saves=()=>{ + let id=this.props.categoryid; let {fileList,description} =this.state; @@ -131,10 +132,12 @@ class AccessoryModal extends Component{ description:description, attachment_ids:newfileList }).then((result)=>{ - console.log(result) - if(result !== undefined){ - this.props.setupdate() - this.props.showNotification('提交成功') + + if(result.data.status===0){ + debugger + this.props.Cancel() + this.props.setupdate() + // this.setState({ // Modalstype:true, // Modalstopval:result.data.message, @@ -142,9 +145,16 @@ class AccessoryModal extends Component{ // loadtype:true // }) this.ModalCancelModalCancel() + + notification.open({ + message: '提示', + description: + '提交成功' + }); if(this.props.seeworks!=undefined){ this.props.history.push(this.props.seeworks); } + } }).catch((error)=>{ @@ -170,10 +180,12 @@ class AccessoryModal extends Component{ description:description, attachment_ids:newfileList }).then((result)=>{ - console.log(result) + if(result.data.status===0){ + debugger + this.props.Cancel() this.props.setupdate() - this.props.showNotification('提交成功') + // this.setState({ // Modalstype:true, // Modalstopval:result.data.message, @@ -182,9 +194,15 @@ class AccessoryModal extends Component{ // }) this.ModalCancelModalCancel() + notification.open({ + message: '提示', + description: + '提交成功' + }); if(this.props.seeworks!=undefined){ this.props.history.push(this.props.seeworks); } + } }).catch((error)=>{ diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js index 0cd48c245..14b1f71e1 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js @@ -1,262 +1,263 @@ -import React,{ Component } from "react"; -import { Modal,Checkbox,Upload,Button,Icon,message} from "antd"; -import { WordsBtn, getUploadActionUrl} from 'educoder'; -import axios from 'axios'; -import Modals from '../../modals/Modals'; -const CheckboxGroup = Checkbox.Group; - -class AccessoryModal2 extends Component{ - constructor(props){ - super(props); - this.state={ - group_ids:[], - fileList:[], - Modalstype:false, - Modalstopval:"", - ModalCancel:"", - ModalSave:"", - loadtype:false - } - } - - - componentDidMount() { - - } - - //勾选实训 - shixunhomeworkedit=(list)=>{ - - this.setState({ - group_ids:list - }) - - } - // 附件相关 START - handleChange = (info) => { - let fileList = info.fileList; - console.log(fileList) - // for(var list of fileList ){ - // console.log(fileList) - // } - this.setState({ fileList }); - } - - onAttachmentRemove = (file) => { - // confirm({ - // title: '确定要删除这个附件吗?', - // okText: '确定', - // cancelText: '取消', - // // content: 'Some descriptions', - // onOk: () => { - // this.deleteAttachment(file) - // }, - // onCancel() { - // console.log('Cancel'); - // }, - // }); - // return false; - - // this.setState({ - // Modalstype:true, - // Modalstopval:'确定要删除这个附件吗?', - // ModalSave: ()=>this.deleteAttachment(file), - // ModalCancel:this.cancelAttachment - // }) - // return false; - - this.deleteAttachment(file); - } - - - - - deleteAttachment = (file) => { - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - axios.delete(url, { - }) - .then((response) => { - if (response.data) { - const { status } = response.data; - if (status == 0) { - console.log('--- success') - - this.setState((state) => { - const index = state.fileList.indexOf(file); - const newFileList = state.fileList.slice(); - newFileList.splice(index, 1); - return { - fileList: newFileList, - }; - }); - } - } - }) - .catch(function (error) { - console.log(error); - }); - } - - ModalCancelModalCancel=()=>{ - this.setState({ - Modalstype:false, - Modalstopval:"", - ModalSave:this.ModalCancelModalCancel, - loadtype:false - }) - this.props.Cancel() - } - componentDidUpdate = (prevProps) => { - if (JSON.stringify(prevProps.fileList) != JSON.stringify(this.props.fileList)) { - this.setState({ - fileList: this.props.fileList - }) - } - if (prevProps.description != this.props.description) { - this.setState({ - description: this.props.description - }) - } - } - Saves=()=>{ - let {fileList,description} =this.state; - let newfileList=[]; - for(var list of fileList){ - newfileList.push(list.response.id) - } - this.props.Saves && this.props.Saves(newfileList, description) - return; - let id=this.props.categoryid; - - console.log(newfileList) - let url="/graduation_works/"+id+"/revise_attachment.json" - axios.post(url,{ - description:description, - attachment_ids:newfileList - }).then((result)=>{ - console.log(result) - if(result.data.status===0){ - this.props.setupdate() - this.setState({ - Modalstype:true, - Modalstopval:result.data.message, - ModalSave:this.ModalCancelModalCancel, - loadtype:true - }) - - } - }).catch((error)=>{ - - }) - } - - settextarea=(e)=>{ - this.setState({ - description:e.target.value - }) - } - - render(){ - let {description,fileList, - Modalstype, - Modalstopval, - ModalCancel, - ModalSave, - loadtype, - }=this.state; - let {course_groups}=this.props; - const uploadProps = { - width: 600, - // https://github.com/ant-design/ant-design/issues/15505 - // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。 - // showUploadList: false, - action: getUploadActionUrl(), - onChange: this.handleChange, - onRemove: this.onAttachmentRemove, - beforeUpload: (file) => { - console.log('beforeUpload', file.name); - const isLt150M = file.size / 1024 / 1024 < 150; - if (!isLt150M) { - message.error('文件大小必须小于150MB!'); - } - return isLt150M; - }, - }; - - - return( -
- {/*提示*/} - - -
-

- - -

- - - -

- - - (单个文件最大150M) - -

- - - - - -
- -
- ) - } -} +import React,{ Component } from "react"; +import { Modal,Checkbox,Upload,Button,Icon,message} from "antd"; +import { WordsBtn, getUploadActionUrl} from 'educoder'; +import axios from 'axios'; +import Modals from '../../modals/Modals'; +const CheckboxGroup = Checkbox.Group; + +class AccessoryModal2 extends Component{ + constructor(props){ + super(props); + this.state={ + group_ids:[], + fileList:[], + Modalstype:false, + Modalstopval:"", + ModalCancel:"", + ModalSave:"", + loadtype:false + } + } + + + componentDidMount() { + + } + + //勾选实训 + shixunhomeworkedit=(list)=>{ + + this.setState({ + group_ids:list + }) + + } + // 附件相关 START + handleChange = (info) => { + let fileList = info.fileList; + console.log(fileList) + // for(var list of fileList ){ + // console.log(fileList) + // } + this.setState({ fileList }); + } + + onAttachmentRemove = (file) => { + // confirm({ + // title: '确定要删除这个附件吗?', + // okText: '确定', + // cancelText: '取消', + // // content: 'Some descriptions', + // onOk: () => { + // this.deleteAttachment(file) + // }, + // onCancel() { + // console.log('Cancel'); + // }, + // }); + // return false; + + // this.setState({ + // Modalstype:true, + // Modalstopval:'确定要删除这个附件吗?', + // ModalSave: ()=>this.deleteAttachment(file), + // ModalCancel:this.cancelAttachment + // }) + // return false; + + this.deleteAttachment(file); + } + + + + + deleteAttachment = (file) => { + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { + console.log('--- success') + + this.setState((state) => { + const index = state.fileList.indexOf(file); + const newFileList = state.fileList.slice(); + newFileList.splice(index, 1); + return { + fileList: newFileList, + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + + ModalCancelModalCancel=()=>{ + this.setState({ + Modalstype:false, + Modalstopval:"", + ModalSave:this.ModalCancelModalCancel, + loadtype:false + }) + this.props.Cancel() + } + componentDidUpdate = (prevProps) => { + if (JSON.stringify(prevProps.fileList) != JSON.stringify(this.props.fileList)) { + this.setState({ + fileList: this.props.fileList + }) + } + if (prevProps.description != this.props.description) { + this.setState({ + description: this.props.description + }) + } + } + Saves=()=>{ + debugger + let {fileList,description} =this.state; + let newfileList=[]; + for(var list of fileList){ + newfileList.push(list.response.id) + } + this.props.Saves && this.props.Saves(newfileList, description) + return; + let id=this.props.categoryid; + + console.log(newfileList) + let url="/graduation_works/"+id+"/revise_attachment.json" + axios.post(url,{ + description:description, + attachment_ids:newfileList + }).then((result)=>{ + console.log(result) + if(result.data.status===0){ + this.props.setupdate() + this.setState({ + Modalstype:true, + Modalstopval:result.data.message, + ModalSave:this.ModalCancelModalCancel, + loadtype:true + }) + + } + }).catch((error)=>{ + + }) + } + + settextarea=(e)=>{ + this.setState({ + description:e.target.value + }) + } + + render(){ + let {description,fileList, + Modalstype, + Modalstopval, + ModalCancel, + ModalSave, + loadtype, + }=this.state; + let {course_groups}=this.props; + const uploadProps = { + width: 600, + // https://github.com/ant-design/ant-design/issues/15505 + // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。 + // showUploadList: false, + action: getUploadActionUrl(), + onChange: this.handleChange, + onRemove: this.onAttachmentRemove, + beforeUpload: (file) => { + console.log('beforeUpload', file.name); + const isLt150M = file.size / 1024 / 1024 < 150; + if (!isLt150M) { + message.error('文件大小必须小于150MB!'); + } + return isLt150M; + }, + }; + + + return( +
+ {/*提示*/} + + +
+

+ + +

+ + + +

+ + + (单个文件最大150M) + +

+ + + + + +
+ +
+ ) + } +} export default AccessoryModal2; \ No newline at end of file diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index 70df3f577..afa0669d4 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -193,9 +193,9 @@ class ExerciseListItem extends Component{ { IsStudent &&
- {item.current_status ===0&&item.exercise_status>1?
  • 继续答题
    • : - item.current_status ===1&&item.exercise_status>1?
  • 查看答题
    • : - item.current_status ===2&&item.exercise_status>1?
  • this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题
    • :""} + {item.current_status ===0&&item.exercise_status>1?
  • 继续答题
    • : + item.current_status ===1&&item.exercise_status>1?
  • 查看答题
    • : + item.current_status ===2&&item.exercise_status>1?
  • this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题
    • :""}
    } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 1fe0e5c9b..2cbf0fe33 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -178,6 +178,7 @@ class GraduateTaskItem extends Component{ funlist={this.props.funlist} />:""} {this.state.visibles===true?0){ - if($(document).scrollTop()>0){ - $(".-task-sidebar .gotop").show(); - $(".gotop").click(function(){ - $("html,body").scrollTop(0); - }); - } - if($(document).scrollTop()==0){ - $(".-task-sidebar .gotop").hide(); - } - } -}); - -function rightSlider(){ - var poi=parseInt((parseInt($(window).width())- 1200 )/2)-60; - // console.log(parseInt($(window).width())+" "+poi); - if(poi>0){ - $(".-task-sidebar").css("right",poi); - }else{ - $(".-task-sidebar").css("right","0px"); - } - $(".-task-sidebar").show(); -} - - -function _initSider() { - var $descSide = $("
    ").appendTo("body"); - $(".-task-sidebar>div").hover(function(){ - //移入显示二维码 - if($(this).hasClass("scan")){ - $(".scan_ewm").show().css({right:"75px",opacity:0}).stop().animate({ - right:"45px",opacity:1 - }) - return; - } - var $tool = $(this).attr("tooltips"); - $descSide.html($tool+"
    "); - $descSide.data('_dom', this) - $descSide.show().css({ - left:$(this).offset().left - $descSide.width()-30, - opacity:0, - top:$(this).offset().top - }).stop().animate({ - left:$(this).offset().left - $descSide.width()-5, - opacity:1 - },400); - },function(){ - if($(this).hasClass("scan")){ - $(".scan_ewm").stop().animate({right:"75px",opacity:0},200).hide(); - } - $descSide.stop().animate({ - left:$(this).offset().left - $descSide.width()-30, - opacity:0 - },200).hide(); - }); - rightSlider(); - - $(window).scroll(function() { - if ($descSide.height()) { - var hoverIcon = $descSide.data('_dom') - $descSide.css('top', $(hoverIcon).offset().top) - } - }) -} - -class SiderBar extends Component { - constructor(props) { - super(props) - - } - - componentDidMount() { - _initSider(); - - } - - render() { - return ( -
    -
    - - - -
    - -
    - - - -
    - - - -
    - -

    -

    - -

    微信扫一扫

    -

    关注公众号

    - -

    -

    -
    - -
    - - - -
    - -
    - ); - } -} - -export default SiderBar; +import React, { Component } from 'react'; +import { getImageUrl} from 'educoder'; +import './TPMIndex.css'; + +const $ = window.$; + +$(window).resize(function(){ + rightSlider(); +}); + +$(window).scroll(function(){ + if($(".gotop").length>0){ + if($(document).scrollTop()>0){ + $(".-task-sidebar .gotop").show(); + $(".gotop").click(function(){ + $("html,body").scrollTop(0); + }); + } + if($(document).scrollTop()==0){ + $(".-task-sidebar .gotop").hide(); + } + } +}); + +function rightSlider(){ + var poi=parseInt((parseInt($(window).width())- 1200 )/2)-60; + // console.log(parseInt($(window).width())+" "+poi); + if(poi>0){ + $(".-task-sidebar").css("right",poi); + }else{ + $(".-task-sidebar").css("right","0px"); + } + $(".-task-sidebar").show(); +} + + +function _initSider() { + var $descSide = $("
    ").appendTo("body"); + $(".-task-sidebar>div").hover(function(){ + //移入显示二维码 + if($(this).hasClass("scan")){ + $(".scan_ewm").show().css({right:"75px",opacity:0}).stop().animate({ + right:"45px",opacity:1 + }) + return; + } + var $tool = $(this).attr("tooltips"); + $descSide.html($tool+"
    "); + $descSide.data('_dom', this) + $descSide.show().css({ + left:$(this).offset().left - $descSide.width()-30, + opacity:0, + top:$(this).offset().top + }).stop().animate({ + left:$(this).offset().left - $descSide.width()-5, + opacity:1 + },400); + },function(){ + if($(this).hasClass("scan")){ + $(".scan_ewm").stop().animate({right:"75px",opacity:0},200).hide(); + } + $descSide.stop().animate({ + left:$(this).offset().left - $descSide.width()-30, + opacity:0 + },200).hide(); + }); + rightSlider(); + + $(window).scroll(function() { + if ($descSide.height()) { + var hoverIcon = $descSide.data('_dom') + $descSide.css('top', $(hoverIcon).offset().top) + } + }) +} + +class SiderBar extends Component { + constructor(props) { + super(props) + + } + + componentDidMount() { + _initSider(); + + } + + render() { + return ( +
    +
    + + + +
    + +
    + + + +
    + + + +
    + +

    +

    + +

    微信扫一扫

    +

    关注公众号

    + +

    +

    +
    + +
    + + + +
    + +
    + ); + } +} + +export default SiderBar; From d96882662ac100f08834c86b32943cd47829c771 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 14:53:55 +0800 Subject: [PATCH 7/7] null --- .../courses/graduation/tasks/Graduationtaskitem.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js b/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js index 53cf3d9e2..973f1b9ba 100644 --- a/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js +++ b/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js @@ -15,7 +15,7 @@ class Graduationtaskitem extends Component{ } render(){ let { item }=this.props; - const _content = this.parseCommentContent(item.content) + const _content = item.content && this.parseCommentContent(item.content) return(
    @@ -48,12 +48,14 @@ class Graduationtaskitem extends Component{
    -
    + {!!_content &&
    -
    +
    } + {!_content && {"暂未写评语"}} +
    {(item && item.children && item.children.length) ?
    : ''} {this.renderChildenComments(item)}